diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 60e0ecf..9c67542 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,8 +2,8 @@ import to.dev.dev_android.build.BuildConfig plugins { id("com.android.application") - id("kotlin-android") - id("kotlin-android-extensions") + kotlin("android") + kotlin("android.extensions") } android { @@ -40,7 +40,7 @@ dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) implementation(project(path = ":baseui")) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${BuildConfig.kotlinVersion}") + implementation(embeddedKotlin("stdlib-jdk8")) implementation("androidx.browser:browser:1.0.0") testImplementation("junit:junit:4.12") diff --git a/build.gradle.kts b/build.gradle.kts index 12b8b13..e1ffb89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ allprojects { } tasks.wrapper { - gradleVersion = "5.4.1" + gradleVersion = "5.5" distributionType = Wrapper.DistributionType.ALL } diff --git a/buildSrc/src/main/kotlin/to/dev/dev_android/build/Config.kt b/buildSrc/src/main/kotlin/to/dev/dev_android/build/Config.kt index b573399..a4e7ca1 100644 --- a/buildSrc/src/main/kotlin/to/dev/dev_android/build/Config.kt +++ b/buildSrc/src/main/kotlin/to/dev/dev_android/build/Config.kt @@ -1,7 +1,7 @@ package to.dev.dev_android.build object BuildConfig { - const val kotlinVersion = "1.3.31" + const val kotlinVersion = "1.3.41" const val minSdkVersion = 18 const val targetSdkVersion = 28 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee69dd6..e0c4de3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0a..8e25e6c 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/gradlew.bat b/gradlew.bat index 15e1ee3..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS,