diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-04-16 12:55:38 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-04-16 12:55:38 +0200 |
commit | 037b9759d03cde6d457cbeb8ecbe0ecf37b099da (patch) | |
tree | 1fbb905392f796cc7d027334532b861a927ff886 | |
parent | 5a6750337868f7c92baa65d2118ac7ecc84f6010 (diff) | |
download | akono-037b9759d03cde6d457cbeb8ecbe0ecf37b099da.tar.gz akono-037b9759d03cde6d457cbeb8ecbe0ecf37b099da.tar.bz2 akono-037b9759d03cde6d457cbeb8ecbe0ecf37b099da.zip |
versions
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rw-r--r-- | library/build.gradle.kts | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea13fdfd..ed5aaee4 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.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 5f80d039..0f683dc0 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -1,11 +1,7 @@ plugins { id("com.android.library") - id("org.jetbrains.kotlin.android") - id("org.jetbrains.kotlin.android.extensions") -} -apply { - plugin("kotlin-android") - plugin("kotlin-android-extensions") + kotlin("android") + kotlin("android.extensions") } android { @@ -39,7 +35,7 @@ android { externalNativeBuild { cmake { //path = File("src/main/cpp/CMakeLists.txt") - path = file("src/main/cpp/CMakeLists.txt") + setPath(file("src/main/cpp/CMakeLists.txt")) } } @@ -70,14 +66,14 @@ dependencies { // Use the Kotlin JUnit integration. testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") - androidTestImplementation("androidx.test:core:1.0.0") + androidTestImplementation("androidx.test:core:1.1.0") androidTestImplementation("androidx.test:runner:1.1.1") androidTestImplementation("androidx.test:rules:1.1.1") // Assertions - androidTestImplementation("androidx.test.ext:junit:1.0.0") - androidTestImplementation("androidx.test.ext:truth:1.0.0") - androidTestImplementation("com.google.truth:truth:0.42") + androidTestImplementation("androidx.test.ext:junit:1.1.0") + androidTestImplementation("androidx.test.ext:truth:1.1.0") + androidTestImplementation("com.google.truth:truth:0.44") // Use the Kotlin test library. androidTestImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version") |