Merge pull request #192 from hyperskill/hotfix/1.1.1

Hotfix 1.1.1
hyperskill · Oct 4, 2022 · 2fb63a6 · 2fb63a6
2 parents de736f8 + 0269f93
commit 2fb63a6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/androidHyperskillApp/build.gradle.kts b/androidHyperskillApp/build.gradle.kts
@@ -56,6 +56,8 @@ dependencies {
     implementation(libs.android.coil.svg)
     implementation(libs.android.splashscreen)
     implementation(libs.android.timepicker)
+
+    coreLibraryDesugaring(libs.android.desugar.jdk)
 }
 
 android {
@@ -145,6 +147,14 @@ android {
     buildFeatures {
         viewBinding = true
     }
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+
+        // Sets Java compatibility to Java 8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 ktlint {

diff --git a/gradle/app.versions.toml b/gradle/app.versions.toml
@@ -2,5 +2,5 @@
 minSdk = '24'
 targetSdk = '31'
 compileSdk = '31'
-versionName = '1.1'
-versionCode = '14'
+versionName = '1.1.1'
+versionCode = '15'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -84,6 +84,8 @@ android-coil-svg = { module = "io.coil-kt:coil-svg", version = "2.1.0" }
 android-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.0-beta02" }
 android-timepicker = { module = "io.github.ShawnLin013:number-picker", version = "2.4.13" }
 
+android-desugar-jdk = { module = "com.android.tools:desugar_jdk_libs", version = "1.1.5" }
+
 [bundles]
 ktor-common = ['ktor-core', 'ktor-serialization', 'ktor-logging', 'ktor-contentNegotiation', 'ktor-serialization-json']
 android-test = ['android-test-junit', 'android-test-runner', 'android-test-robolectric']