Merge remote-tracking branch 'origin/main' into migrate-to-3.38

Author: jakobkoerber

.github/workflows/deploy_beta.yml

@@ -20,16 +20,16 @@ jobs:
       - name: Install Bundle
         run: cd ./${{ matrix.platform }} && bundle install
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
       - if: matrix.platform == 'android'
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
 
       - name: Install Flutter Packages
         run: |

.github/workflows/lint_test_build.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
 
       - name: Build iOS
         run: flutter build ipa --no-codesign

.gitignore

@@ -50,3 +50,6 @@ ios/Runner.app.dSYM.zip
 ios/Runner.ipa
 ios/fastlane/report.xml
 ios/fastlane/README.md
+
+#Android Studio Miscellaneous
+bugreport-*.zip

android/app/build.gradle.kts

@@ -13,16 +13,16 @@ plugins {
 android {
     namespace = "de.tum.in.tumcampus"
     compileSdk = 36
-    ndkVersion = "27.0.12077973"
+    ndkVersion = "28.1.13356709"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlin {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 

assets/images/map/locate.webp

@@ -1,14 +1,12 @@
 import UIKit
-import Flutter
-import GoogleMaps
+import Flutter  
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GMSServices.provideAPIKey("AIzaSyAxUbnUMsXWVzeptXiLuNDMGpGEVFHLT4Y")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }