Merge pull request #1550 from joreilly/fix-build-error

force a more recent version of tink

Author: joreilly

androidApp/build.gradle.kts

@@ -113,18 +113,18 @@ android {
 
             matchingFallbacks += listOf("release")
         }
-//        create("benchmark") {
-//            isShrinkResources = true
-//            isMinifyEnabled = true
-//            signingConfig = signingConfigs.getByName("confetti")
-//            setProguardFiles(
-//                listOf(
-//                    getDefaultProguardFile("proguard-android.txt"),
-//                    "proguard-benchmark.pro"
-//                )
-//            )
-//            matchingFallbacks.addAll(listOf("release"))
-//        }
+        create("benchmark") {
+            isShrinkResources = true
+            isMinifyEnabled = true
+            signingConfig = signingConfigs.getByName("confetti")
+            setProguardFiles(
+                listOf(
+                    getDefaultProguardFile("proguard-android.txt"),
+                    "proguard-benchmark.pro"
+                )
+            )
+            matchingFallbacks.addAll(listOf("release"))
+        }
         getByName("debug") {
             signingConfig = signingConfigs.getByName("confetti")
         }

build-logic/build.gradle.kts

@@ -23,6 +23,9 @@ dependencies {
         // Crashlytics depends on datastore v1.0 but we're using v1.1
         exclude(group = "androidx.datastore", module = "datastore-preferences")
     }
+    // Force a newer version of tink in the classpath for compatibility with protobuf-java:4.x
+    // Removes java.lang.NoSuchMethodError: 'void com.google.crypto.tink.proto.Keyset.makeExtensionsImmutable()'
+    implementation(libs.tink)
     implementation(libs.plugin.wire)
     implementation(libs.plugin.compose.multiplatform)
     implementation(libs.jib.core)

gradle/libs.versions.toml

@@ -206,7 +206,7 @@ wear-compose-material = "androidx.wear.compose:compose-material:1.5.0-alpha11"
 wear-compose-material3 = "androidx.wear.compose:compose-material3:1.0.0-alpha34"
 xoxo = "net.mbonnin.xoxo:xoxo:0.4.0"
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
-
+tink = "com.google.crypto.tink:tink:1.17.0"
 jib-core = "com.google.cloud.tools:jib-core:0.27.2"
 google-cloud-run = "com.google.cloud:google-cloud-run:0.54.0"
 

wearApp/src/main/res/values-fr/strings.xml

@@ -27,4 +27,8 @@
     <string name="settings_empty_name">empty name</string>
     <string name="home_bookmarked_sessions">Bookmarked Sessions</string>
     <string name="home_settings_content_description">Settings</string>
+    <string name="settings_allow_lte">Autoriser le LTE</string>
+    <string name="settings_show_networks">Afficher les réseaux</string>
+    <string name="settings_show_networks_and_data">Afficher les réseaux et la data</string>
+    <string name="settings_hide_networks">Masquer les réseaux</string>
 </resources>

wearApp/src/screenshotTest/java/dev/johnoreilly/confetti/wear/ConferenceHomeScreenTest.kt

@@ -35,6 +35,8 @@ fun ConferenceHomeScreen() {
             daySelected = {},
             onSettingsClick = {},
             onBookmarksClick = {},
+            addBookmark = {},
+            removeBookmark = {}
         )
     }
 
@@ -72,6 +74,8 @@ fun ConferenceHomeScreenWithBookmarks() {
             daySelected = {},
             onSettingsClick = {},
             onBookmarksClick = {},
+            addBookmark = {},
+            removeBookmark = {}
         )
     }
 
@@ -93,6 +97,8 @@ fun ConferenceHomeScreenLoading() {
             daySelected = {},
             onSettingsClick = {},
             onBookmarksClick = {},
+            addBookmark = {},
+            removeBookmark = {}
         )
     }