bump dependencies - works on api 34 emulator

jameshnsears · Aug 31, 2023 · bc037b3 · bc037b3
1 parent 348c44f
commit bc037b3
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 57 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'kotlin-android'
-    id "io.gitlab.arturbosch.detekt" version "1.23.0"
+    id "io.gitlab.arturbosch.detekt" version "1.23.1"
     id "org.jlleitschuh.gradle.ktlint" version "11.5.0"
     id 'com.diffplug.spotless'
     id 'org.jetbrains.kotlin.android'
@@ -35,7 +35,7 @@ localProperties.load(new FileInputStream(localPropertiesFile))
 android {
     namespace "com.github.jameshnsears.cameraoverlay"
 
-    compileSdk 33
+    compileSdk 34
 
     signingConfigs {
         googleplay {
@@ -104,12 +104,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
@@ -119,7 +119,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.3"
     }
 
     flavorDimensions 'Version'
@@ -178,10 +178,10 @@ android {
 
 dependencies {
     androidTestImplementation 'androidx.activity:activity-compose:1.7.2'
-    androidTestImplementation 'androidx.compose.foundation:foundation:1.4.3'
+    androidTestImplementation 'androidx.compose.foundation:foundation:1.5.0'
     androidTestImplementation 'androidx.compose.material3:material3:1.1.1'
     androidTestImplementation 'androidx.compose.material3:material3-window-size-class:1.1.1'
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.ext:truth:1.5.0'
@@ -191,45 +191,45 @@ dependencies {
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0'
     androidTestImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
-    androidTestImplementation 'io.mockk:mockk-android:1.13.5'
-    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
+    androidTestImplementation 'io.mockk:mockk-android:1.13.7'
+    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     androidTestImplementation 'junit:junit:4.13.2'
 
-    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.4.3'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.5.0'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
     implementation 'androidx.activity:activity-compose:1.7.2'
     implementation 'androidx.activity:activity-ktx:1.7.2'
-    implementation 'androidx.compose.compiler:compiler:1.4.8'
-    implementation 'androidx.compose.foundation:foundation:1.4.3'
+    implementation 'androidx.compose.compiler:compiler:1.5.3'
+    implementation 'androidx.compose.foundation:foundation:1.5.0'
     implementation 'androidx.compose.material3:material3:1.1.1'
     implementation 'androidx.compose.material3:material3-window-size-class:1.1.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.4.3'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.3'
-    implementation 'androidx.compose.ui:ui:1.4.3'
-    implementation 'androidx.compose.ui:ui-tooling:1.4.3'
+    implementation 'androidx.compose.material:material-icons-extended:1.5.0'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.5.0'
+    implementation 'androidx.compose.ui:ui:1.5.0'
+    implementation 'androidx.compose.ui:ui-tooling:1.5.0'
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
-    implementation 'androidx.navigation:navigation-compose:2.6.0'
+    implementation 'androidx.navigation:navigation-compose:2.7.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'com.google.firebase:firebase-analytics:21.3.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'io.coil-kt:coil-compose:2.4.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2'
-    implementation platform('com.google.firebase:firebase-bom:32.1.1')
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+    implementation platform('com.google.firebase:firebase-bom:32.2.3')
     implementation project(path: ':module:common')
     implementation project(path: ':module:opencv')
     implementation project(path: ':module:permissions')
 
     testImplementation 'com.google.truth:truth:1.1.5'
     testImplementation 'com.jakewharton.timber:timber:5.0.1'
     testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
     testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.0'

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.4.7'
-        kotlin_version = '1.8.21'
+        compose_version = '1.5.3'
+        kotlin_version = '1.9.10'
     }
 
     repositories {
@@ -18,7 +18,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
         classpath 'org.jacoco:org.jacoco.core:0.8.10'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.20.0'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 02 14:02:45 BST 2023
+#Thu Aug 31 09:51:47 BST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/module/common/build.gradle b/module/common/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id "io.gitlab.arturbosch.detekt" version "1.23.0"
+    id "io.gitlab.arturbosch.detekt" version "1.23.1"
     id "org.jlleitschuh.gradle.ktlint" version "11.5.0"
 }
 
@@ -11,11 +11,11 @@ apply from: '../../ktlint.gradle'
 android {
     namespace 'com.github.jameshnsears.cameraoverlay.common'
 
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 26
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -38,12 +38,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {

diff --git a/module/opencv/build.gradle b/module/opencv/build.gradle
@@ -9,11 +9,11 @@ println "OpenCV: " + openCVersionName
 android {
     namespace 'org.opencv'
 
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 26
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -32,8 +32,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {

diff --git a/module/permissions/build.gradle b/module/permissions/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id "io.gitlab.arturbosch.detekt" version "1.23.0"
+    id "io.gitlab.arturbosch.detekt" version "1.23.1"
     id "org.jlleitschuh.gradle.ktlint" version "11.5.0"
 }
 
@@ -12,11 +12,11 @@ apply from: '../../ktlint.gradle'
 android {
     namespace 'com.github.jameshnsears.cameraoverlay.permissions'
 
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 26
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -52,12 +52,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
@@ -66,7 +66,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.3"
     }
 
     flavorDimensions 'Version'
@@ -91,20 +91,20 @@ android {
 }
 
 dependencies {
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.0'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
     implementation 'androidx.activity:activity-compose:1.7.2'
-    implementation 'androidx.compose.foundation:foundation:1.4.3'
+    implementation 'androidx.compose.foundation:foundation:1.5.0'
     implementation 'androidx.compose.material3:material3:1.1.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.4.3'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.3'
-    implementation 'androidx.compose.ui:ui:1.4.3'
-    implementation 'androidx.compose.ui:ui-tooling:1.4.3'
+    implementation 'androidx.compose.material:material-icons-extended:1.5.0'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.5.0'
+    implementation 'androidx.compose.ui:ui:1.5.0'
+    implementation 'androidx.compose.ui:ui-tooling:1.5.0'
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'