Merge branch 'main' into update_ReactiveCircus_android-emulator-runne…

…r_to_v2_30_1
rozPierog · Sep 24, 2024 · c7f2422 · c7f2422
2 parents 33b2e77 + 59c9ae9
commit c7f2422
Show file tree

Hide file tree

Showing 91 changed files with 2,471 additions and 2,449 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,29 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.834.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.920.0)
+    aws-sdk-core (3.193.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -32,11 +35,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.104.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,15 +67,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -85,6 +87,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -93,10 +96,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -105,37 +108,36 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-android_versioning (0.5.5)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.50.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -150,19 +152,21 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.1)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    nkf (0.2.0)
+    optparse (0.5.0)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.3)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -172,8 +176,8 @@ GEM
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -186,17 +190,13 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         minSdkVersion 25
         targetSdkVersion 34
         compileSdk 34
-        versionCode 158
-        versionName "1.20.1"
+        versionCode 182
+        versionName "1.21.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
         manifestPlaceholders = [profileable: false]
@@ -145,37 +145,36 @@ dependencies {
     }
     implementation platform("androidx.compose:compose-bom:$compose_bom_version")
 
-    instantImplementation('com.google.android.gms:play-services-instantapps:18.0.1')
-    playStoreImplementation 'com.google.android.gms:play-services-wearable:18.1.0'
+    instantImplementation('com.google.android.gms:play-services-instantapps:18.1.0')
+    playStoreImplementation 'com.google.android.gms:play-services-wearable:18.2.0'
     playStoreImplementation "androidx.wear:wear-remote-interactions:1.0.0"
-    playStoreImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1'
+    playStoreImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3'
 
     // Tooling support (Previews, etc.)
     debugImplementation "androidx.compose.ui:ui-tooling"
     implementation "androidx.compose.ui:ui-tooling-preview"
 
     // Material Design
-    implementation "androidx.compose.material:material"
-    implementation "androidx.compose.material3:material3:1.2.0"
+    implementation "androidx.compose.material3:material3:1.3.0-beta04"
     implementation "androidx.compose.material3:material3-window-size-class"
 
     implementation 'com.github.KieronQuinn:MonetCompat:0.2.1'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     // Navigation
-    implementation "androidx.navigation:navigation-compose:2.7.7"
+    implementation "androidx.navigation:navigation-compose:2.8.0-beta05"
 
     // Integration with observables
     implementation "androidx.compose.runtime:runtime-livedata"
     // Jetpack Utils
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.30.1"
     implementation "androidx.compose.animation:animation-graphics"
 
-    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation "androidx.activity:activity-compose:1.9.0"
 
     // UI Tests
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.1"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.8"
     testImplementation 'junit:junit:4.13.2'
-    androidTestUtil 'androidx.test:orchestrator:1.4.2'
+    androidTestUtil 'androidx.test:orchestrator:1.5.0'
 }
 
 tasks.register("ktlintCheck", JavaExec) {

diff --git a/app/src/androidTest/java/com/omelan/cofi/ScreenshotCreator.kt b/app/src/androidTest/java/com/omelan/cofi/ScreenshotCreator.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color.parseColor
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -29,7 +28,6 @@ import org.junit.runners.JUnit4
 
 @ExperimentalAnimationApi
 @ExperimentalComposeUiApi
-@ExperimentalMaterialApi
 @ExperimentalMaterial3Api
 @RunWith(JUnit4::class)
 class ScreenshotCreator {

diff --git a/app/src/androidTest/java/com/omelan/cofi/pages/RecipeDetailsTest.kt b/app/src/androidTest/java/com/omelan/cofi/pages/RecipeDetailsTest.kt
@@ -1,7 +1,6 @@
 package com.omelan.cofi.pages
 
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -50,7 +49,6 @@ class RecipeDetailsTest {
         type = StepType.OTHER,
     )
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun testEmptyDescription() {
@@ -70,7 +68,6 @@ class RecipeDetailsTest {
         composeTestRule.onNodeWithTag("recipe_description").assertDoesNotExist()
     }
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun testFilledDescription() {
@@ -90,7 +87,6 @@ class RecipeDetailsTest {
         composeTestRule.onNodeWithTag("recipe_description").assertExists()
     }
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun testStepsWithTime() {
@@ -118,7 +114,6 @@ class RecipeDetailsTest {
             .assertIsOn()
     }
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun testStepsWithoutTime() {
@@ -146,7 +141,6 @@ class RecipeDetailsTest {
             .assertIsOff()
     }
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun pipTest() {

diff --git a/app/src/androidTest/java/com/omelan/cofi/pages/RecipeEditTest.kt b/app/src/androidTest/java/com/omelan/cofi/pages/RecipeEditTest.kt
@@ -1,11 +1,13 @@
 package com.omelan.cofi.pages
 
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.test.*
 import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextClearance
+import androidx.compose.ui.test.performTextInput
 import com.omelan.cofi.LocalPiPState
 import com.omelan.cofi.share.model.Recipe
 import com.omelan.cofi.share.model.Step
@@ -23,7 +25,6 @@ class RecipeEditTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    @ExperimentalMaterialApi
     @ExperimentalComposeUiApi
     @Test
     fun testAddingNameAndDescription() {

diff --git a/app/src/full/java/com/omelan/cofi/utils/InstantUtils.kt b/app/src/full/java/com/omelan/cofi/utils/InstantUtils.kt
@@ -5,7 +5,6 @@ package com.omelan.cofi.utils
 import android.app.Activity
 import android.content.Context
 
-@Suppress("unused", "unused")
 object InstantUtils {
     fun isInstantApp(@Suppress("UNUSED_PARAMETER") context: Context) = false
 

diff --git a/app/src/full/java/com/omelan/cofi/utils/WearUtils.kt b/app/src/full/java/com/omelan/cofi/utils/WearUtils.kt
@@ -1,4 +1,4 @@
-@file:Suppress("EmptyMethod", "SameReturnValue", "UNUSED_PARAMETER", "unused")
+@file:Suppress("EmptyMethod", "SameReturnValue", "UNUSED_PARAMETER")
 
 package com.omelan.cofi.utils