Merge pull request #36 from leinardi/task/update-dependencies

Task: Update dependencies
leinardi · Jun 29, 2023 · 29e63a6 · 29e63a6
2 parents fcc6d51 + 2b2a363
commit 29e63a6
Show file tree

Hide file tree

Showing 61 changed files with 7,052 additions and 4,839 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,8 +18,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -83,8 +83,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -107,17 +107,18 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_RELEASE_KEYSTORE_PWD: ${{ secrets.RELEASE_KEYSTORE_PWD }}
         with:
-          arguments: bundleRelease analyzeReleaseBundle
+          arguments: bundleRelease # analyzeReleaseBundle <- Disable due to https://github.com/spotify/ruler/issues/116
 
       - name: Clean secrets
         if: always()
         run: ./release/clean-secrets.sh
 
-      - name: Upload Ruler report
-        uses: actions/upload-artifact@v3
-        with:
-          name: ruler
-          path: app/build/reports/ruler
+      # Disable due to https://github.com/spotify/ruler/issues/116
+      # - name: Upload Ruler report
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: ruler
+      #     path: app/build/reports/ruler
 
   build-debug:
     name: Build debug
@@ -133,8 +134,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -173,8 +174,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -213,8 +214,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -246,8 +247,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -293,8 +294,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -343,8 +344,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -373,7 +374,7 @@ jobs:
 
       - name: Run emulator to generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
+        uses: reactivecircus/android-emulator-runner@v2.28.0
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
@@ -390,7 +391,7 @@ jobs:
 
       ## Actual task
       - name: Run Android tests on API ${{ matrix.api-level }} / ${{ matrix.arch }} / ${{ matrix.target }}
-        uses: reactivecircus/android-emulator-runner@v2
+        uses: reactivecircus/android-emulator-runner@v2.28.0
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
@@ -407,7 +408,7 @@ jobs:
           script: |
             echo $GITHUB_REPOSITORY
             adb devices
-            ./gradlew connectedCheck
+            ./gradlew app:connectedCheck
 
       - name: Make file path compatible with upload-artifact
         run: find . -path '*/build/*' -name '*:*' -exec bash -c 'mv "$0" "${0//:/_}"' {} \;
@@ -437,8 +438,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

diff --git a/.github/workflows/mobsf.yml b/.github/workflows/mobsf.yml
@@ -18,8 +18,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,8 +61,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 11.0.14
+          distribution: 'temurin'
+          java-version: 17.0.6
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -57,11 +57,13 @@ android {
 
     buildTypes {
         debug {
+            namespace config.android.applicationId + '.debug'
             signingConfig signingConfigs.debug
             applicationIdSuffix ".debug"
         }
 
         release {
+            namespace config.android.applicationId
             if (useReleaseKeystore) {
                 signingConfig signingConfigs.release
             } else {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.leinardi.forlago">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:name=".Forlago"
         android:allowBackup="false"

diff --git a/app/src/main/kotlin/com/leinardi/forlago/ui/MainActivity.kt b/app/src/main/kotlin/com/leinardi/forlago/ui/MainActivity.kt
@@ -38,7 +38,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import androidx.navigation.compose.NavHost
@@ -48,7 +47,6 @@ import com.google.android.play.core.appupdate.AppUpdateInfo
 import com.google.android.play.core.appupdate.AppUpdateManager
 import com.google.android.play.core.install.model.ActivityResult.RESULT_IN_APP_UPDATE_FAILED
 import com.google.android.play.core.install.model.AppUpdateType
-import com.leinardi.forlago.R
 import com.leinardi.forlago.library.android.api.ext.getActivity
 import com.leinardi.forlago.library.navigation.api.navigator.ForlagoNavigator
 import com.leinardi.forlago.library.navigation.api.navigator.NavigatorEvent
@@ -156,12 +154,9 @@ fun ForlagoMainScreen(
     val bottomSheetNavigator = rememberBottomSheetNavigator(skipHalfExpanded = true)
     val navHostController = rememberNavController(bottomSheetNavigator)
     val activity = LocalContext.current.getActivity() as MainActivity
-    val keyboardController = LocalSoftwareKeyboardController.current
     val snackbarHostState = remember { SnackbarHostState() }
     LaunchedEffect(navHostController) {
         forlagoNavigator.destinations.onEach { event ->
-            Timber.d("backQueue = ${navHostController.backQueue.map { "route = ${it.destination.route}" }}")
-            keyboardController?.hide()
             when (event) {
                 is NavigatorEvent.Directions -> navHostController.navigate(
                     event.destination,
@@ -225,9 +220,9 @@ private suspend fun showSnackbarForCompleteUpdate(
     activity: MainActivity,
 ) {
     snackbarHostState.showSnackbar(
-        message = activity.getString(R.string.i18n_app_update_snackbar_download_ready_label),
+        message = activity.getString(com.leinardi.forlago.library.i18n.R.string.i18n_app_update_snackbar_download_ready_label),
         duration = SnackbarDuration.Indefinite,
-        actionLabel = activity.getString(R.string.i18n_app_update_snackbar_download_ready_button),
+        actionLabel = activity.getString(com.leinardi.forlago.library.i18n.R.string.i18n_app_update_snackbar_download_ready_button),
     ).also { snackbarResult ->
         if (snackbarResult == SnackbarResult.ActionPerformed) {
             activity.completeAppUpdate()

diff --git a/app/src/main/kotlin/com/leinardi/forlago/ui/MainContract.kt b/app/src/main/kotlin/com/leinardi/forlago/ui/MainContract.kt
@@ -39,7 +39,10 @@ object MainContract {
     }
 
     sealed class Effect : ViewEffect {
-        data class ShowErrorSnackbar(val message: String, @StringRes val actionLabel: Int = R.string.i18n_generic_snackbar_dismissal) : Effect()
+        data class ShowErrorSnackbar(
+            val message: String,
+            @StringRes val actionLabel: Int = com.leinardi.forlago.library.i18n.R.string.i18n_generic_snackbar_dismissal,
+        ) : Effect()
         data class StartUpdateFlowForResult(val appUpdateInfo: AppUpdateInfo, @AppUpdateType val appUpdateType: Int) : Effect()
         object FinishActivity : Effect()
         object ShowSnackbarForCompleteUpdate : Effect()

diff --git a/app/src/main/kotlin/com/leinardi/forlago/ui/MainViewModel.kt b/app/src/main/kotlin/com/leinardi/forlago/ui/MainViewModel.kt
@@ -86,7 +86,9 @@ class MainViewModel @Inject constructor(
                     sendEffect { Effect.FinishActivity }
                 }
             }
-            is Event.OnInAppUpdateFailed -> sendEffect { Effect.ShowErrorSnackbar(app.getString(R.string.i18n_app_update_error)) }
+            is Event.OnInAppUpdateFailed -> sendEffect { Effect.ShowErrorSnackbar(
+                app.getString(com.leinardi.forlago.library.i18n.R.string.i18n_app_update_error),
+            ) }
             is Event.OnIntentReceived -> handleOnIntentReceived(event)
             is Event.OnShown -> checkForUpdates(true)
         }
@@ -95,9 +97,9 @@ class MainViewModel @Inject constructor(
     private fun handleOnIntentReceived(event: Event.OnIntentReceived) {
         viewModelScope.launch {
             var handled = false
-            getFeaturesInteractor().forEach {
+            getFeaturesInteractor().forEach { feature ->
                 if (!handled) {
-                    it.handleIntent(event.intent).ifTrue { handled = true }
+                    feature.handleIntent(event.intent).ifTrue { handled = true }
                 }
             }
             if (!handled && event.isNewIntent) {