Merge pull request #50 from futuredapp/feature/update-dependencies

Update dependencies
futuredapp · Aug 11, 2021 · 2beb188 · 2beb188
2 parents 99623b5 + e74de4f
commit 2beb188
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,6 @@ allprojects {
 
 subprojects {
     apply(plugin = Deps.Plugins.ktlint)
-
     ktlint {
         version.set(Versions.ktlintExtension)
         ignoreFailures.set(true)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,3 +5,7 @@ plugins {
 repositories {
     jcenter()
 }
+
+dependencies {
+    implementation("com.github.ben-manes:gradle-versions-plugin:0.36.0")
+}
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -16,6 +16,6 @@ object Deps {
     object AndroidX {
         const val appcompat = "androidx.appcompat:appcompat:${Versions.androidx}"
         const val palette = "androidx.palette:palette:${Versions.palette}"
-        const val ktx = "androidx.core:core-ktx:${Versions.androidx}"
+        const val ktx = "androidx.core:core-ktx:${Versions.androidxKtx}"
     }
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -3,15 +3,16 @@ object Versions {
     const val gradle = "4.1.0"
 
     // plugins
-    const val detekt = "1.14.2"
-    const val ktlint = "10.0.0"
+    const val detekt = "1.17.1"
+    const val ktlint = "10.1.0"
     const val ktlintExtension = "0.41.0"
     const val mavenPublish = "0.15.0"
     const val dokka = "1.4.30"
 
     // kotlin
     const val kotlin = "1.4.32"
 
-    const val androidx = "1.1.0"
+    const val androidx = "1.3.1"
+    const val androidxKtx = "1.6.0"
     const val palette = "1.0.0"
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -18,6 +18,15 @@ android {
     sourceSets {
         getByName("main").java.srcDir("src/main/kotlin")
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
 
 dependencies {

diff --git a/databinding/build.gradle.kts b/databinding/build.gradle.kts
@@ -22,6 +22,15 @@ android {
     buildFeatures {
         dataBinding = true
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
 
 dependencies {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -23,6 +23,15 @@ android {
     dataBinding {
         isEnabled = true
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
 
 dependencies {