diff options
| author | Allan Wang <me@allanwang.ca> | 2020-02-18 01:10:48 -0800 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2020-02-18 01:10:48 -0800 |
| commit | d66335b74b313c1d7a00059d7220303cb66534fc (patch) | |
| tree | 4f090744b635fe5d4ebdab1a11c28b7805772748 | |
| parent | 388af789948cc7409589e5853dea0b3f14ea239b (diff) | |
| parent | 0e4e82933001ab749538109210cb0940ea912db0 (diff) | |
| download | kau-d66335b74b313c1d7a00059d7220303cb66534fc.tar.gz kau-d66335b74b313c1d7a00059d7220303cb66534fc.tar.bz2 kau-d66335b74b313c1d7a00059d7220303cb66534fc.zip | |
Merge branch 'dev' into kpref
| -rw-r--r-- | android-lib.gradle | 4 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/kau/Dependencies.kt | 12 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/kau/Versions.kt | 9 | ||||
| -rw-r--r-- | sample/build.gradle | 4 |
4 files changed, 26 insertions, 3 deletions
diff --git a/android-lib.gradle b/android-lib.gradle index 196cc1b..aa8aad7 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -70,6 +70,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt index caf2f6e..b543dc3 100644 --- a/buildSrc/src/main/kotlin/kau/Dependencies.kt +++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt @@ -29,6 +29,9 @@ object Dependencies { fun kauFastAdapter(version: String) = kau("fastadapter", version) @JvmStatic + fun kauFastAdapterViewBinding(version: String) = kau("fastadapter-viewbinding", version) + + @JvmStatic fun kauKprefActivity(version: String) = kau("kpref-activity", version) @JvmStatic @@ -47,6 +50,15 @@ object Dependencies { @JvmField val kotlinReflect = kotlin("reflect") + @JvmField + val koin = koin("android") + + @JvmField + val koinTest = koin("test") + + @JvmStatic + fun koin(type: String) = "org.koin:koin-$type:${Versions.koin}" + const val junit = "junit:junit:${Versions.junit}" const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}" diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index 86155eb..95955e0 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -27,7 +27,7 @@ object Versions { const val constraintLayout = "2.0.0-beta4" // https://mvnrepository.com/artifact/androidx.core/core-ktx - const val coreKtx = "1.2.0-rc01" + const val coreKtx = "1.2.0" // https://kotlinlang.org/docs/reference/using-gradle.html const val kotlin = "1.3.61" @@ -54,7 +54,10 @@ object Versions { const val iconicsCommunity = "3.5.95.1" // https://github.com/afollestad/material-dialogs/releases - const val materialDialog = "3.1.1" + const val materialDialog = "3.3.0" + + // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md + const val koin = "2.0.1" // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google const val espresso = "3.2.0" @@ -78,7 +81,7 @@ object Versions { const val bugsnagPlugin="4.7.3" // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google - const val gradlePlugin = "3.6.0-rc02" + const val gradlePlugin = "3.6.0-rc03" // https://github.com/dcendents/android-maven-gradle-plugin/releases const val mavenPlugin = "2.1" // https://github.com/Triple-T/gradle-play-publisher/releases diff --git a/sample/build.gradle b/sample/build.gradle index 47baed2..0ed7818 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -89,6 +89,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' |