Bump to target Java 17 and uplift remaining dependencies

medic · Mar 12, 2024 · 46fd0bc · 46fd0bc
1 parent 057ee2b
commit 46fd0bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -129,8 +129,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
     // Flag to enable support for the new language APIs
     coreLibraryDesugaringEnabled true
   }
@@ -413,6 +413,9 @@ android {
     warningsAsErrors true
     xmlReport false
   }
+  buildFeatures {
+    buildConfig true
+  }
 }
 
 dependencies {
@@ -422,9 +425,9 @@ dependencies {
   implementation 'androidx.activity:activity:1.8.2'
   implementation 'androidx.fragment:fragment:1.6.2'
   compileOnly 'com.github.spotbugs:spotbugs-annotations:4.8.3'
-  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-inline:4.0.0'
+  testImplementation 'org.mockito:mockito-inline:5.2.0'
   testImplementation 'com.google.android:android-test:4.1.1.4'
   testImplementation 'org.robolectric:robolectric:4.11.1'
   testImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,3 @@
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true