Merge pull request #74 from wordpress-mobile/upgrade/all-the-things

Upgrade/all the things
wordpress-mobile · Nov 14, 2023 · 10f3b7d · 10f3b7d
2 parents a4a2401 + b179251
commit 10f3b7d
Show file tree

Hide file tree

Showing 23 changed files with 186 additions and 476 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,11 @@ allprojects {
 
     tasks.withType(KotlinCompile).all {
         kotlinOptions {
+            jvmTarget = JavaVersion.VERSION_1_8
             allWarningsAsErrors = true
+            freeCompilerArgs += [
+                    "-opt-in=kotlin.RequiresOptIn"
+            ]
         }
     }
 }
@@ -47,27 +51,27 @@ subprojects {
 
 ext {
     minSdkVersion = 24
-    compileSdkVersion = 33
-    targetSdkVersion = 33
+    compileSdkVersion = 34
+    targetSdkVersion = 34
 }
 
 ext {
     // libs
-    wordPressFluxCVersion = 'develop-fa819801570505a0e9b4f7f226bb704b88ccc1d2'
-    wordpressUtilsVersion = "2.4.0"
+    wordPressFluxCVersion = 'trunk-7ea7465680431fa4df5f0433d4c8b8395055b997'
+    wordpressUtilsVersion = "2.6.0"
 
     // main
-    androidxAppcompatVersion = '1.4.1'
-    androidxCoreVersion = '1.7.0'
+    androidxAppcompatVersion = '1.4.2'
+    androidxCoreVersion = '1.12.0'
     androidxDatastoreVersion = '1.0.0'
-    androidxConstraintlayoutVersion = '2.1.1'
-    androidxLifecycleVersion = '2.4.0'
-    androidxNavigationVersion = '2.3.5'
+    androidxConstraintlayoutVersion = '2.1.4'
+    androidxLifecycleVersion = '2.6.2'
+    androidxNavigationVersion = '2.5.3'
     androidxSwipeToRefreshVersion = '1.1.0'
     chrisbanesPhotoviewVersion = '2.3.0'
-    glideVersion = '4.12.0'
-    googleMaterialVersion = '1.5.0'
-    kotlinxCoroutinesVersion = '1.5.2'
+    glideVersion = '4.13.2'
+    googleMaterialVersion = '1.6.1'
+    kotlinxCoroutinesVersion = '1.6.4'
     squareupRetrofitVersion = "2.9.0"
 
     // other

diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle
@@ -11,7 +11,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk  rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -26,9 +26,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
 
     lint {
         warningsAsErrors true

diff --git a/mediapicker/domain/build.gradle b/mediapicker/domain/build.gradle
@@ -10,7 +10,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker.api"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -20,6 +20,11 @@ android {
     lint {
         warningsAsErrors true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/mediapicker/domain/src/main/java/org/wordpress/android/mediapicker/model/MediaItem.kt b/mediapicker/domain/src/main/java/org/wordpress/android/mediapicker/model/MediaItem.kt
@@ -30,9 +30,9 @@ data class MediaItem(
         @Parcelize
         data class RemoteMedia(
             val id: Long,
-            val name: String,
+            val name: String?,
             val url: String,
-            val date: String
+            val date: String?
         ) : Identifier(REMOTE_MEDIA)
 
         @Parcelize

diff --git a/mediapicker/source-camera/build.gradle b/mediapicker/source-camera/build.gradle
@@ -8,7 +8,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker.source.camera"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk  rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -18,6 +18,11 @@ android {
     lint {
         warningsAsErrors true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/...a/src/main/java/org/wordpress/android/mediapicker/source/camera/CameraMediaPickerSetup.kt b/...a/src/main/java/org/wordpress/android/mediapicker/source/camera/CameraMediaPickerSetup.kt
@@ -4,15 +4,13 @@ import org.wordpress.android.mediapicker.api.MediaPickerSetup
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.CAMERA
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.HIDDEN
 
-class CameraMediaPickerSetup private constructor() {
-    companion object {
-        fun build(): MediaPickerSetup {
-            return MediaPickerSetup(
-                primaryDataSource = CAMERA,
-                isMultiSelectEnabled = false,
-                areResultsQueued = false,
-                searchMode = HIDDEN
-            )
-        }
+object CameraMediaPickerSetup  {
+    fun build(): MediaPickerSetup {
+        return MediaPickerSetup(
+            primaryDataSource = CAMERA,
+            isMultiSelectEnabled = false,
+            areResultsQueued = false,
+            searchMode = HIDDEN
+        )
     }
 }
diff --git a/mediapicker/source-device/build.gradle b/mediapicker/source-device/build.gradle
@@ -11,7 +11,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker.source.device"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk  rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -21,6 +21,11 @@ android {
     lint {
         warningsAsErrors true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/...e/src/main/java/org/wordpress/android/mediapicker/source/device/DeviceMediaPickerSetup.kt b/...e/src/main/java/org/wordpress/android/mediapicker/source/device/DeviceMediaPickerSetup.kt
@@ -8,28 +8,16 @@ import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.HIDDEN
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.VISIBLE_UNTOGGLED
 import org.wordpress.android.mediapicker.model.MediaTypes
 
-class DeviceMediaPickerSetup private constructor() {
-    companion object {
-        fun buildMediaPicker(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
-            return MediaPickerSetup(
-                primaryDataSource = DEVICE,
-                isMultiSelectEnabled = canMultiSelect,
-                areResultsQueued = false,
-                searchMode = VISIBLE_UNTOGGLED,
-                availableDataSources = setOf(SYSTEM_PICKER),
-                allowedTypes = mediaTypes.allowedTypes,
-                title = R.string.photo_picker_title
-            )
-        }
-
-        fun buildSystemPicker(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
-            return MediaPickerSetup(
-                primaryDataSource = SYSTEM_PICKER,
-                isMultiSelectEnabled = canMultiSelect,
-                areResultsQueued = false,
-                searchMode = HIDDEN,
-                allowedTypes = mediaTypes.allowedTypes
-            )
-        }
+object DeviceMediaPickerSetup {
+    fun build(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
+        return MediaPickerSetup(
+            primaryDataSource = DEVICE,
+            isMultiSelectEnabled = canMultiSelect,
+            areResultsQueued = false,
+            searchMode = VISIBLE_UNTOGGLED,
+            availableDataSources = setOf(SYSTEM_PICKER),
+            allowedTypes = mediaTypes.allowedTypes,
+            title = R.string.photo_picker_title
+        )
     }
 }
diff --git a/mediapicker/source-gif/build.gradle b/mediapicker/source-gif/build.gradle
@@ -11,7 +11,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker.source.gif"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk  rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -21,6 +21,11 @@ android {
     lint {
         warningsAsErrors true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/...rce-gif/src/main/java/org/wordpress/android/mediapicker/source/gif/GifMediaPickerSetup.kt b/...rce-gif/src/main/java/org/wordpress/android/mediapicker/source/gif/GifMediaPickerSetup.kt
@@ -5,17 +5,15 @@ import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.GIF_LIB
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.VISIBLE_TOGGLED
 import org.wordpress.android.mediapicker.model.MediaType.IMAGE
 
-class GifMediaPickerSetup private constructor() {
-    companion object {
-        fun build(canMultiSelect: Boolean): MediaPickerSetup {
-            return MediaPickerSetup(
-                primaryDataSource = GIF_LIBRARY,
-                isMultiSelectEnabled = canMultiSelect,
-                allowedTypes = setOf(IMAGE),
-                areResultsQueued = false,
-                searchMode = VISIBLE_TOGGLED,
-                title = R.string.photo_picker_gif
-            )
-        }
+object GifMediaPickerSetup {
+    fun build(canMultiSelect: Boolean): MediaPickerSetup {
+        return MediaPickerSetup(
+            primaryDataSource = GIF_LIBRARY,
+            isMultiSelectEnabled = canMultiSelect,
+            allowedTypes = setOf(IMAGE),
+            areResultsQueued = false,
+            searchMode = VISIBLE_TOGGLED,
+            title = R.string.photo_picker_gif
+        )
     }
 }
diff --git a/mediapicker/source-wordpress/build.gradle b/mediapicker/source-wordpress/build.gradle
@@ -11,7 +11,7 @@ plugins {
 android {
     namespace "org.wordpress.android.mediapicker.source.wordpress"
 
-    compileSdkVersion rootProject.compileSdkVersion
+    compileSdk  rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -21,6 +21,11 @@ android {
     lint {
         warningsAsErrors true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/...c/main/java/org/wordpress/android/mediapicker/source/wordpress/MediaLibraryPickerSetup.kt b/...c/main/java/org/wordpress/android/mediapicker/source/wordpress/MediaLibraryPickerSetup.kt
@@ -5,17 +5,15 @@ import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.WP_MEDI
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.HIDDEN
 import org.wordpress.android.mediapicker.model.MediaTypes
 
-class MediaLibraryPickerSetup private constructor() {
-    companion object {
-        fun build(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
-            return MediaPickerSetup(
-                primaryDataSource = WP_MEDIA_LIBRARY,
-                isMultiSelectEnabled = canMultiSelect,
-                allowedTypes = mediaTypes.allowedTypes,
-                areResultsQueued = false,
-                searchMode = HIDDEN,
-                title = R.string.media_library_title
-            )
-        }
+object MediaLibraryPickerSetup {
+    fun build(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
+        return MediaPickerSetup(
+            primaryDataSource = WP_MEDIA_LIBRARY,
+            isMultiSelectEnabled = canMultiSelect,
+            allowedTypes = mediaTypes.allowedTypes,
+            areResultsQueued = false,
+            searchMode = HIDDEN,
+            title = R.string.media_library_title
+        )
     }
 }
diff --git a/...ss/src/main/java/org/wordpress/android/mediapicker/source/wordpress/MediaLibrarySource.kt b/...ss/src/main/java/org/wordpress/android/mediapicker/source/wordpress/MediaLibrarySource.kt
@@ -122,7 +122,7 @@ class MediaLibrarySource(
     }
 
     private fun List<MediaModel>.toMediaItems(mediaType: MediaType): List<MediaItem> {
-        return this.filter { it.url != null }.map { mediaModel ->
+        return this.map { mediaModel ->
             MediaItem(
                 RemoteMedia(
                     mediaModel.mediaId,

diff --git a/mediapicker/src/main/java/org/wordpress/android/mediapicker/setup/SystemMediaPickerSetup.kt b/mediapicker/src/main/java/org/wordpress/android/mediapicker/setup/SystemMediaPickerSetup.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.mediapicker.setup
+
+import org.wordpress.android.mediapicker.api.MediaPickerSetup
+import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.SYSTEM_PICKER
+import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.HIDDEN
+import org.wordpress.android.mediapicker.model.MediaTypes
+
+object SystemMediaPickerSetup {
+    fun build(mediaTypes: MediaTypes, canMultiSelect: Boolean): MediaPickerSetup {
+        return MediaPickerSetup(
+            primaryDataSource = SYSTEM_PICKER,
+            isMultiSelectEnabled = canMultiSelect,
+            areResultsQueued = false,
+            searchMode = HIDDEN,
+            allowedTypes = mediaTypes.allowedTypes
+        )
+    }
+}
diff --git a/...icker/src/main/java/org/wordpress/android/mediapicker/ui/MediaPickerActionModeCallback.kt b/...icker/src/main/java/org/wordpress/android/mediapicker/ui/MediaPickerActionModeCallback.kt
@@ -74,5 +74,6 @@ internal class MediaPickerActionModeCallback(private val viewModel: MediaPickerV
         lifecycleRegistry.handleLifecycleEvent(ON_STOP)
     }
 
-    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
 }