Upgrade AS

Tommy-Geenexus · Jul 29, 2023 · 801c1c2 · 801c1c2
1 parent 104cc66
commit 801c1c2
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 51 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ plugins {
 android {
     namespace "com.none.tom.exiferaser"
 
-    compileSdkVersion 34
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.none.tom.exiferaser"
@@ -42,23 +42,17 @@ android {
         viewBinding true
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    packagingOptions {
-        resources {
-            excludes += ["META-INF/AL2.0", "META-INF/LGPL2.1"]
-        }
-    }
-
     testOptions {
         unitTests {
             includeAndroidResources = true
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt b/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt
@@ -53,14 +53,14 @@ sealed class WindowSizeClass : Parcelable {
     }
 
     @Parcelize
-    object Unspecified : WindowSizeClass()
+    data object Unspecified : WindowSizeClass()
 
     @Parcelize
-    object Compact : WindowSizeClass()
+    data object Compact : WindowSizeClass()
 
     @Parcelize
-    object Medium : WindowSizeClass()
+    data object Medium : WindowSizeClass()
 
     @Parcelize
-    object Expanded : WindowSizeClass()
+    data object Expanded : WindowSizeClass()
 }
diff --git a/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt b/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt
@@ -50,7 +50,7 @@ sealed class MainSideEffect : Parcelable {
     ) : MainSideEffect()
 
     @Parcelize
-    object DeleteCameraImages : MainSideEffect()
+    data object DeleteCameraImages : MainSideEffect()
 
     @Parcelize
     data class ExternalPicturesDeleted(
@@ -63,13 +63,13 @@ sealed class MainSideEffect : Parcelable {
     ) : MainSideEffect()
 
     @Parcelize
-    object FlexibleUpdateReadyToInstall : MainSideEffect()
+    data object FlexibleUpdateReadyToInstall : MainSideEffect()
 
     @Parcelize
-    object FlexibleUpdateFailed : MainSideEffect()
+    data object FlexibleUpdateFailed : MainSideEffect()
 
     @Parcelize
-    object ImageSourcesReadComplete : MainSideEffect()
+    data object ImageSourcesReadComplete : MainSideEffect()
 
     @Parcelize
     data class LaunchCamera(
@@ -82,21 +82,21 @@ sealed class MainSideEffect : Parcelable {
     ) : MainSideEffect()
 
     @Parcelize
-    object NavigateToSelectionSavePath : MainSideEffect()
+    data object NavigateToSelectionSavePath : MainSideEffect()
 
     @Parcelize
-    object NavigateToSettings : MainSideEffect()
+    data object NavigateToSettings : MainSideEffect()
 
     @Parcelize
-    object NavigateToHelp : MainSideEffect()
+    data object NavigateToHelp : MainSideEffect()
 
     @Parcelize
     data class PasteImages(
         val uris: List<Uri>
     ) : MainSideEffect()
 
     @Parcelize
-    object PasteImagesNone : MainSideEffect()
+    data object PasteImagesNone : MainSideEffect()
 
     @Parcelize
     data class ReceivedImage(

diff --git a/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt b/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt
@@ -39,7 +39,7 @@ sealed class SelectionSideEffect : Parcelable {
     ) : SelectionSideEffect()
 
     @Parcelize
-    object SelectionHandled : SelectionSideEffect()
+    data object SelectionHandled : SelectionSideEffect()
 
     @Parcelize
     data class ShareImages(

diff --git a/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt b/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt
@@ -29,7 +29,7 @@ import kotlinx.parcelize.Parcelize
 sealed class Result : Parcelable {
 
     @Parcelize
-    object Empty : Result()
+    data object Empty : Result()
 
     @Parcelize
     data class Report(
@@ -43,5 +43,5 @@ sealed class Result : Parcelable {
     ) : Result()
 
     @Parcelize
-    object HandledAll : Result()
+    data object HandledAll : Result()
 }
diff --git a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt
@@ -26,11 +26,11 @@ import kotlinx.parcelize.Parcelize
 sealed class UpdatePriority : Parcelable {
 
     @Parcelize
-    object Low : UpdatePriority()
+    data object Low : UpdatePriority()
 
     @Parcelize
-    object Medium : UpdatePriority()
+    data object Medium : UpdatePriority()
 
     @Parcelize
-    object High : UpdatePriority()
+    data object High : UpdatePriority()
 }
diff --git a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt
@@ -29,19 +29,19 @@ import kotlinx.parcelize.Parcelize
 sealed class UpdateResult : Parcelable {
 
     @Parcelize
-    object NotAvailable : UpdateResult()
+    data object NotAvailable : UpdateResult()
 
     @Parcelize
-    object Available : UpdateResult()
+    data object Available : UpdateResult()
 
     @Parcelize
     data class InProgress(
         @IntRange(from = PROGRESS_MIN.toLong(), to = PROGRESS_MAX.toLong()) val progress: Int
     ) : UpdateResult()
 
     @Parcelize
-    object ReadyToInstall : UpdateResult()
+    data object ReadyToInstall : UpdateResult()
 
     @Parcelize
-    object FailedToInstall : UpdateResult()
+    data object FailedToInstall : UpdateResult()
 }
diff --git a/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml b/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml
@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="108dp"
     android:height="108dp"
     android:tint="@color/color_teal_500"

diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,3 @@
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,43 +1,43 @@
 [versions]
 activity = "1.7.2"
-agp = "8.0.2"
+agp = "8.1.0"
 app-compat = "1.6.1"
 coil = "2.4.0"
 constraint-layout = "2.1.4"
-core = "1.9.0"
+core = "1.10.1"
 core-splashscreen = "1.0.1"
-coroutines = "1.7.1"
+coroutines = "1.7.3"
 curtains = "1.2.4"
-dagger-hilt = "2.46.1"
+dagger-hilt = "2.47"
 dagger-hilt-vm-compiler = "1.0.0"
 datastore = "1.0.0"
 drag-and-drop = "1.0.0"
 detekt = "1.23.0"
 exif-interface = "1.0.3"
-fragment = "1.6.0"
+fragment = "1.6.1"
 insetter = "0.6.1"
 junit = "4.13.2"
 junit-ext = "1.1.5"
-kotlin = "1.8.22"
-ktlint = "11.4.0"
-leakcanary = "2.11"
+kotlin = "1.9.0"
+ktlint = "11.5.0"
+leakcanary = "2.12"
 lifecycle = "2.6.1"
 material = "1.9.0"
 mockK = "1.13.5"
 navigation = "2.6.0"
 orbit = "6.0.0"
 play-core = "1.10.3"
 play-core-ktx = "1.8.1"
-recyclerview = "1.3.0"
-roboelectric = "4.9.2"
+recyclerview = "1.3.1"
+roboelectric = "4.10.3"
 rules = "1.5.0"
-spotless = "6.19.0"
+spotless = "6.20.0"
 strikt = "0.34.1"
 timber = "5.0.1"
-turbine = "0.13.0"
+turbine = "1.0.0"
 versions = "0.47.0"
 window = "1.1.0"
-wire = "4.7.1"
+wire = "4.8.0"
 
 [libraries]
 activity = { module = "androidx.activity:activity-ktx", version.ref = "activity" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jun 18 14:22:02 CEST 2023
+#Sat Jul 29 17:06:41 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists