From 66174a7ef019a18dd8cff0490d4539b69ef3857f Mon Sep 17 00:00:00 2001
From: Peter Leibiger <kuhnroyal@gmail.com>
Date: Tue, 4 Jun 2024 14:46:54 +0200
Subject: [PATCH] Update example app android build (#439)

---
 example/android/app/build.gradle                | 17 ++++++-----------
 .../android/app/src/main/AndroidManifest.xml    |  2 +-
 .../kotlin/com/mapbox/example/MainActivity.kt   |  6 ------
 .../main/res/drawable-v21/launch_background.xml | 12 ------------
 example/android/gradle.properties               |  3 ---
 .../gradle/wrapper/gradle-wrapper.properties    |  2 +-
 example/pubspec.yaml                            |  2 --
 7 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 example/android/app/src/main/kotlin/com/mapbox/example/MainActivity.kt
 delete mode 100644 example/android/app/src/main/res/drawable-v21/launch_background.xml

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 2e6ec1b6d..f6d70ba42 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,17 +26,17 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    namespace "com.mapbox.example"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace "org.maplibre.example"
+    compileSdkVersion 34
+    ndkVersion "26.1.10909125"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -44,7 +44,6 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.mapbox.mapboxglexample"
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -63,7 +62,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 4791ee70e..97b2ce858 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".MainActivity"
+            android:name="io.flutter.embedding.android.FlutterActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/example/android/app/src/main/kotlin/com/mapbox/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/mapbox/example/MainActivity.kt
deleted file mode 100644
index 911d1cd12..000000000
--- a/example/android/app/src/main/kotlin/com/mapbox/example/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mapbox.example
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index f74085f3f..000000000
--- a/example/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index b9a9a2464..94adc3a3f 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,6 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index b5fc5a7b8..dc159ecf5 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 00bd849e1..9cc1af292 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -18,8 +18,6 @@ dependencies:
   path_provider: ^2.0.15
   http: ^1.1.0
   collection: ^1.17.1
-  # temporary fix:
-  platform: ^3.1.0
   device_info_plus: ^9.0.2
 
 dev_dependencies: