Merge pull request #87 from babybuddy/tone-down-breasts

Update compileSDK, remove "nudity"

3rdparty/patched-zxing-build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 35
     // ndk version 25 is known to support c++20 (see #386)
     // ndkVersion '25.1.8937393'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 35
 
         ndk {
             // speed up build: compile only arm versions
@@ -24,11 +24,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     externalNativeBuild {
         cmake {
@@ -44,9 +44,9 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
 
-    def camerax_version = "1.0.2"
+    def camerax_version = "1.4.1"
     implementation "androidx.camera:camera-core:${camerax_version}"
 
 }

app/build.gradle

@@ -80,14 +80,14 @@ preBuild.dependsOn(invokeResourcesMakefile)
 preBuild.dependsOn(invokeHelpMakefile)
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "eu.pkgsoftware.babybuddywidgets"
         minSdkVersion 24
-        targetSdk 34
-        versionCode 43
-        versionName "2.4.2"
+        targetSdk 35
+        versionCode 44
+        versionName "2.4.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -114,31 +114,31 @@ android {
             }
         }
     }
-    lintOptions {
+    namespace 'eu.pkgsoftware.babybuddywidgets'
+    lint {
         abortOnError false
     }
-    namespace 'eu.pkgsoftware.babybuddywidgets'
 }
 
-ext.camerax_version = "1.3.4"
+ext.camerax_version = '1.4.1'
 
 dependencies {
     implementation 'com.squareup.phrase:phrase:1.2.0'
 
     // Retrofit and jackson need to be compatible. Maybe(?) the matching the major versions
     // is enough, but I'm not sure. This version works.
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
+    implementation 'com.squareup.retrofit2:converter-jackson:2.11.0'
 
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.18.2'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2'
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.5'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.concurrent:concurrent-futures:1.2.0'
 

app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/ChildEventHistoryLoader.kt

@@ -128,7 +128,7 @@ class ChildEventHistoryLoader(
 
     private fun newTimelineEntry(e: TimeEntry?): TimelineEntry {
         val result = if (removedViews.size > 0) {
-            removedViews.removeLast()
+            removedViews.removeAt(removedViews.size - 1)
         } else {
             TimelineEntry(fragment, e)
         };
@@ -227,7 +227,7 @@ class ChildEventHistoryLoader(
             View.VISIBLE
         }
         while (currentList.size > items.size) {
-            val removed = currentList.removeLast()
+            val removed = currentList.removeAt(currentList.size - 1)
             if (removedViews.size < 128) {
                 removedViews.add(removed)
             }

app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/AutoHGrid.kt

@@ -82,7 +82,7 @@ class AutoHGrid : ViewGroup {
                 if (newRowWidth > maxWidth) {
                     continue
                 }
-                resultRows[i].add(0, resultRows[prevI].removeLast())
+                resultRows[i].add(0, resultRows[prevI].removeAt(resultRows[prevI].size - 1))
                 modified = true
                 break
             }

app/src/test/java/eu/pkgsoftware/babybuddywidgets/ClientV2IntegrationTest.kt

@@ -15,12 +15,13 @@ import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.SleepEntry
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.TemperatureEntry
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.TummyTimeEntry
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.WeightEntry
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
 import java.net.URL
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 data class ServerUrl(val version: String, val url: String)
 
@@ -133,12 +134,12 @@ class ClientV2IntegrationTest {
         Assert.assertTrue(headCircEntires.entries.size > 0)
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun testObtainLists() = runTest {
+    fun testObtainLists() = runTest(timeout = 60.seconds) {
         for (server in serverUrlArray) {
             serverUrl = server.url
-            println("TESTING BABYBUDDY VERSION: ${server.version}")
+
+            println("TESTING BABYBUDDY VERSION: ${server.version} at ${server.url}")
             runObtainListsTest()
         }
     }

fastlane/Fastfile

@@ -65,6 +65,11 @@ platform :android do
         "android.injected.signing.key.password" => password,
       }
     )
+    last_tag_name = sh("git describe --tags `git rev-list --tags --max-count=1`").strip
+    apk_source_path = "../app/build/outputs/bundle/release/app-release.aab"
+    apk_destination_path = "../babybuddy-for-android-#{last_tag_name}.aab"
+    FileUtils.mv(apk_source_path, apk_destination_path)
+    UI.message("APK moved and renamed to #{apk_destination_path}")
   end
 
   desc "Build release apk for GitHub"
@@ -84,5 +89,10 @@ platform :android do
         "android.injected.signing.key.password" => password,
       }
     )
+    last_tag_name = sh("git describe --tags `git rev-list --tags --max-count=1`").strip
+    apk_source_path = "../app/build/outputs/apk/release/app-release.apk"
+    apk_destination_path = "../babybuddy-for-android-#{last_tag_name}.apk"
+    FileUtils.mv(apk_source_path, apk_destination_path)
+    UI.message("APK moved and renamed to #{apk_destination_path}")
   end
 end

gradle.properties

@@ -14,7 +14,6 @@
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" -Dfile.encoding\=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 #org.gradle.unsafe.configuration-cache=true