Merge branch 'develop' into fix/5744

monsieurtanuki · Oct 30, 2024 · 688cb0a · 688cb0a
2 parents b17dd7e + db544a6
commit 688cb0a
Show file tree

Hide file tree

Showing 23 changed files with 613 additions and 462 deletions.
diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
@@ -50,7 +50,7 @@ on:
         required: true
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   RUBY_VERSION: 3.2.0
 
 jobs:

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: crowdin action
-      uses: crowdin/github-action@v2.2.0
+      uses: crowdin/github-action@v2.3.0
       continue-on-error: true
       with:
         # Upload sources to Crowdin

diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -34,7 +34,7 @@ on:
         required: true
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   RUBY_VERSION: 3.2.0
 
 jobs:

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/waldo_sessions.yml b/.github/workflows/waldo_sessions.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT

diff --git a/packages/smooth_app/android/Gemfile.lock b/packages/smooth_app/android/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)

diff --git a/packages/smooth_app/android/app/build.gradle b/packages/smooth_app/android/app/build.gradle
@@ -4,35 +4,20 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
 
 android {
-    compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    namespace = "org.openfoodfacts.app"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -41,10 +26,10 @@ android {
 
     defaultConfig {
         applicationId "org.openfoodfacts.scanner"
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
         multiDexEnabled true
     }
 
@@ -73,4 +58,5 @@ flutter {
 
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
 }
diff --git a/packages/smooth_app/android/app/src/main/AndroidManifest.xml b/packages/smooth_app/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="org.openfoodfacts.app"
           android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/packages/smooth_app/android/build.gradle b/packages/smooth_app/android/build.gradle
@@ -3,6 +3,27 @@ allprojects {
         google()
         mavenCentral()
     }
+
+    subprojects {
+        afterEvaluate {
+            if (it.hasProperty('android')) {
+                it.android.compileSdkVersion = 35
+                it.android.defaultConfig.targetSdkVersion = 35
+                it.android.compileOptions.sourceCompatibility = JavaVersion.VERSION_21
+                it.android.compileOptions.targetCompatibility = JavaVersion.VERSION_21
+                tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+                    kotlinOptions.jvmTarget = JavaVersion.VERSION_21
+                }
+                if (it.android.namespace == null) {
+                    def manifest = new XmlSlurper().parse(file(it.android.sourceSets.main.manifest.srcFile))
+                    def packageName = manifest.@package.text()
+                    android.namespace = packageName
+                    println("Updating namespace ${packageName}")
+                }
+            }
+        }
+        project.buildDir = "${rootProject.buildDir}/${project.name}"
+    }
 }
 
 rootProject.buildDir = '../build'

diff --git a/packages/smooth_app/android/gradle.properties b/packages/smooth_app/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/packages/smooth_app/android/gradle/wrapper/gradle-wrapper.properties b/packages/smooth_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+
diff --git a/packages/smooth_app/android/settings.gradle b/packages/smooth_app/android/settings.gradle
@@ -17,9 +17,10 @@ pluginManagement {
 }
 
 plugins {
+
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.0" apply false
+    id "com.android.application" version "8.7.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
-include ":app"
+include ":app"