Merge branch 'release/1.3.6'

mshdabiola · Jan 3, 2025 · 72ea1f0 · 72ea1f0
2 parents 3c298d9 + 5f65f47
commit 72ea1f0
Show file tree

Hide file tree

Showing 10 changed files with 24,052 additions and 18,097 deletions.
diff --git a/app/dependencies/fossReliantReleaseRuntimeClasspath.txt b/app/dependencies/fossReliantReleaseRuntimeClasspath.txt
@@ -150,8 +150,8 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:4.29.0
-com.google.protobuf:protobuf-kotlin-lite:4.29.0
+com.google.protobuf:protobuf-javalite:4.26.0
+com.google.protobuf:protobuf-kotlin-lite:4.26.0
 com.jakewharton.timber:timber:5.0.1
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0

diff --git a/app/dependencies/googlePlayReleaseRuntimeClasspath.txt b/app/dependencies/googlePlayReleaseRuntimeClasspath.txt
@@ -244,8 +244,8 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.mlkit:common:18.8.0
 com.google.mlkit:vision-common:17.3.0
 com.google.mlkit:vision-interfaces:16.2.0
-com.google.protobuf:protobuf-javalite:4.29.0
-com.google.protobuf:protobuf-kotlin-lite:4.29.0
+com.google.protobuf:protobuf-javalite:4.26.0
+com.google.protobuf:protobuf-kotlin-lite:4.26.0
 com.jakewharton.timber:timber:5.0.1
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0

diff --git a/app/fossReliantRelease-badging.txt b/app/fossReliantRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='com.mshdabiola.playnotepad.foss' versionCode='135' versionName='1.3.5' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+package: name='com.mshdabiola.playnotepad.foss' versionCode='136' versionName='1.3.6' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'24'
 targetSdkVersion:'35'
 uses-permission: name='android.permission.RECORD_AUDIO'

diff --git a/app/src/fossReliantRelease/generated/baselineProfiles/baseline-prof.txt b/app/src/fossReliantRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/fossReliantRelease/generated/baselineProfiles/startup-prof.txt b/app/src/fossReliantRelease/generated/baselineProfiles/startup-prof.txt
diff --git a/app/src/googlePlayRelease/generated/baselineProfiles/baseline-prof.txt b/app/src/googlePlayRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/googlePlayRelease/generated/baselineProfiles/startup-prof.txt b/app/src/googlePlayRelease/generated/baselineProfiles/startup-prof.txt
diff --git a/benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/detail/DetailActions.kt b/benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/detail/DetailActions.kt
@@ -11,7 +11,7 @@ import androidx.test.uiautomator.Until
 fun MacrobenchmarkScope.goBack() {
     val selector = By.res("detail:back")
 
-    device.wait(Until.hasObject(selector), 5000)
+    device.wait(Until.hasObject(selector), 10000)
 
     val backButton = device.findObject(selector)
     try {
@@ -28,7 +28,7 @@ fun MacrobenchmarkScope.addNote() {
     val titleSelector = By.res("detail:title")
     val contentSelector = By.res("detail:content")
 
-    device.wait(Until.hasObject(titleSelector), 5000)
+    device.wait(Until.hasObject(titleSelector), 10000)
 
     val titleTextField = device.findObject(titleSelector)
     val contentTextField = device.findObject(contentSelector)

diff --git a/benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/main/MainActions.kt b/benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/main/MainActions.kt
@@ -7,12 +7,11 @@ package com.mshdabiola.benchmarks.main
 import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
-import com.mshdabiola.benchmarks.flingElementDownUp
 
 fun MacrobenchmarkScope.goToDetailScreen() {
     val savedSelector = By.res("main:add")
 
-    device.wait(Until.hasObject(savedSelector), 5000)
+    device.wait(Until.hasObject(savedSelector), 10000)
 
     val addButton = device.findObject(savedSelector)
     addButton.click()
@@ -21,11 +20,11 @@ fun MacrobenchmarkScope.goToDetailScreen() {
 }
 
 fun MacrobenchmarkScope.mainScrollNoteDownUp() {
-    val selector = By.res("main:list")
-    device.wait(Until.hasObject(selector), 5000)
-
-    val feedList = device.findObject(selector)
-    device.flingElementDownUp(feedList)
+//    val selector = By.res("main:list")
+//    device.wait(Until.hasObject(selector), 10000)
+//
+//    val feedList = device.findObject(selector)
+//    device.flingElementDownUp(feedList)
 }
 
 fun MacrobenchmarkScope.mainWaitForContent() {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ androidxWork = "2.10.0"
 coil = "2.7.0"
 dependencyGuard = "0.5.0"
 firebaseBom = "33.7.0"
-firebaseCrashlyticsPlugin = "2.9.9"
+firebaseCrashlyticsPlugin = "3.0.2"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.2"
 googleOss = "17.1.0"
@@ -45,7 +45,7 @@ kotlin = "2.1.0"
 kotlinxCoroutines = "1.9.0"
 kotlinxDatetime = "0.6.1"
 kotlinxSerializationJson = "1.7.3"
-protobuf = "4.29.0"
+protobuf = "4.26.0"
 protobufPlugin = "0.9.4"
 ksp = "2.1.0-1.0.29"
 moduleGraph = "2.7.1"
@@ -92,8 +92,8 @@ kover = "0.9.0"
 series = "0.0.19"
 calf = "0.4.0"
 
-versionName = "1.3.5"
-versionCode = "135"
+versionName = "1.3.6"
+versionCode = "136"
 
 telephoto = "0.13.0"
 lottieCompose = "6.5.0"