Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
AndroidUtils
VPNTunnelProxy
Commits
67e5d9c1
Commit
67e5d9c1
authored
May 17, 2021
by
Daniel Wolf
Browse files
Merge branch 'master' of
https://git.frostnerd.com/AndroidUtils/baselibrarykt
parents
aa40ee4a
34b2ff9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
build.gradle
View file @
67e5d9c1
...
...
@@ -27,10 +27,10 @@ buildscript {
ext
.
ANDROID_COMPILE_SDK
=
(
System
.
getenv
(
"ANDROID_COMPILE_SDK"
)
==
null
?
30
:
System
.
getenv
(
"ANDROID_COMPILE_SDK"
)).
toInteger
()
ext
.
ANDROID_TARGET_SDK
=
(
System
.
getenv
(
"ANDROID_TARGET_SDK"
)
==
null
?
ANDROID_COMPILE_SDK
:
System
.
getenv
(
"ANDROID_TARGET_SDK"
)).
toInteger
()
ext
.
ANDROID_MIN_SDK
=
(
System
.
getenv
(
"ANDROID_MIN_SDK"
)
==
null
?
21
:
System
.
getenv
(
"ANDROID_COMPILE_SDK"
)).
toInteger
()
ext
.
KOTLIN_VERSION
=
System
.
getenv
(
"KOTLIN_VERSION"
)
==
null
?
"1.
4.21
"
:
System
.
getenv
(
"KOTLIN_VERSION"
)
ext
.
ANDROID_GRADLE_PLUGIN_VERSION
=
System
.
getenv
(
"ANDROID_GRADLE_PLUGIN_VERSION"
)
==
null
?
"4.
1
.1"
:
System
.
getenv
(
"ANDROID_GRADLE_PLUGIN_VERSION"
)
ext
.
APPCOMPAT_VERSION
=
"1.
2
.0"
ext
.
COROUTINE_VERSION
=
"1.
4.2
"
ext
.
KOTLIN_VERSION
=
System
.
getenv
(
"KOTLIN_VERSION"
)
==
null
?
"1.
5.0
"
:
System
.
getenv
(
"KOTLIN_VERSION"
)
ext
.
ANDROID_GRADLE_PLUGIN_VERSION
=
System
.
getenv
(
"ANDROID_GRADLE_PLUGIN_VERSION"
)
==
null
?
"4.
2
.1"
:
System
.
getenv
(
"ANDROID_GRADLE_PLUGIN_VERSION"
)
ext
.
APPCOMPAT_VERSION
=
"1.
3
.0
-rc01
"
ext
.
COROUTINE_VERSION
=
"1.
5.0
"
ext
.
RECYCLERVIEW_VERSION
=
"1.1.0"
ext
.
ROBOELECTRIC_VERSION
=
"4.3"
...
...
@@ -41,7 +41,7 @@ buildscript {
repositories
{
google
()
jcenter
()
mavenCentral
()
}
dependencies
{
classpath
"com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
...
...
@@ -55,7 +55,7 @@ allprojects {
apply
plugin:
'maven-publish'
repositories
{
google
()
jcenter
()
mavenCentral
()
maven
{
url
'https://nexus.frostnerd.com/repository/libs-release/'
credentials
{
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
67e5d9c1
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-6.
6
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-6.
9
-all.zip
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment