Upgrade packages for Apple Privacy Manifest (#1570)

* Upgraded several packages * Also migrated `share` to `share_plus` * Applied ["Deprecated imperative apply of Flutter's Gradle plugins"](https://docs.flutter.dev/release/breaking-changes/flutter-gradle-plugin-apply) migration * Upgrade to Gradle v8 Fixes #1524
SharezoneApp · Apr 29, 2024 · 644aa5e · 644aa5e
1 parent e1b0da0
commit 644aa5e
Show file tree

Hide file tree

Showing 211 changed files with 2,653 additions and 2,109 deletions.
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -107,6 +107,12 @@ jobs:
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
+      # Our Android configurations require Java 17.
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+        with:
+          distribution: "oracle"
+          java-version: "17"
+
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action
         uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa
@@ -122,7 +128,7 @@ jobs:
           echo $(realpath ./bin) >> $GITHUB_PATH
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Setup signing
         working-directory: app/android
@@ -208,7 +214,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action
@@ -267,7 +273,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action
@@ -156,8 +156,14 @@ jobs:
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
+      # Our Android configurations require Java 17.
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+        with:
+          distribution: "oracle"
+          java-version: "17"
+
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Setup signing
         working-directory: app/android
@@ -216,7 +222,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action

diff --git a/.github/workflows/integration_tests_app_ci.yml b/.github/workflows/integration_tests_app_ci.yml
@@ -84,12 +84,11 @@ jobs:
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
-      # Java is needed for building the APK, see
-      # https://github.com/marketplace/actions/flutter-action.
+      # Our Android configurations require Java 17.
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
         with:
-          distribution: "temurin"
-          java-version: "11"
+          distribution: "oracle"
+          java-version: "17"
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action
@@ -279,7 +278,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Setup signing
         env:

diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action
@@ -158,8 +158,14 @@ jobs:
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
+      # Our Android configurations require Java 17.
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+        with:
+          distribution: "oracle"
+          java-version: "17"
+
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Setup signing
         working-directory: app/android
@@ -218,7 +224,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools==0.50.3
+        run: pip3 install codemagic-cli-tools==0.50.7
 
       - name: Set Flutter version from FVM config file to environment variables
         id: fvm-config-action

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -1,3 +1,12 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+    id 'com.google.firebase.firebase-perf'
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,16 +15,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystorePropertiesFile = rootProject.file("key.properties")
 def keystoreProperties = new Properties()
 def hasKeystorePropertiesFile = keystorePropertiesFile.exists()
@@ -34,6 +33,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "de.codingbrain.sharezone"
     compileSdkVersion 34
 
     compileOptions {
@@ -113,8 +113,6 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
     // These dependencies are required for Flutter integration tests, which run
     // on Firebase Test Lab. Copied these steps from:
     // https://github.com/flutter/flutter/tree/master/packages/integration_test

diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="de.codingbrain.sharezone">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application

diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -1,21 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.0'
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath 'com.google.gms:google-services:4.3.15'
-
-        classpath 'com.google.firebase:perf-plugin:1.4.1'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
-    }
-}
-
 allprojects {
     repositories {
         google()

diff --git a/app/android/gradle.properties b/app/android/gradle.properties
@@ -9,3 +9,6 @@ android.enableR8=true
 # Sourec:
 # https://github.com/fluttercommunity/flutter_workmanager/issues/287#issuecomment-893476072
 org.gradle.jvmargs=-Xmx4608m --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
@@ -1,15 +1,28 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version '8.1.0' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+    id "com.google.gms.google-services" version "4.4.0" apply false
+    id "com.google.firebase.crashlytics" version "2.9.9" apply false
+    id "com.google.firebase.firebase-perf" version "1.4.2" apply false
 }
+
+include ":app"
diff --git a/app/ios/Podfile b/app/ios/Podfile
@@ -27,7 +27,7 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup
 
 target 'Runner' do
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.20.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.24.0'
 
   use_frameworks!
   use_modular_headers!