From 0e4e82933001ab749538109210cb0940ea912db0 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 18 Feb 2020 00:12:57 -0800
Subject: Update versions (#247)

* Update versions

* Add koin

* Add koin test

* Add kotlin jvm version
---
 .idea/codeStyles/codeStyleConfig.xml         |  1 +
 android-lib.gradle                           |  4 ++++
 buildSrc/src/main/kotlin/kau/Dependencies.kt | 12 ++++++++++++
 buildSrc/src/main/kotlin/kau/Versions.kt     |  9 ++++++---
 sample/build.gradle                          |  4 ++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..6e6eec1 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
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
@@ -28,6 +28,9 @@ object Dependencies {
     @JvmStatic
     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)
 
@@ -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'
-- 
cgit v1.2.3