app, dapp: flutter_3_32_7 upgrade

Author: patniemeyer

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
 
     - run: ./app-flutter.sh orchid && cd app-flutter && make
 
@@ -165,7 +165,7 @@ jobs:
 
     - run: DEBIAN_FRONTEND=noninteractive sudo -EH apt-get -y install mingw-w64
 
-    - run: debug=crossndk make -j3 -C app-windows ./env/dotdot/gui-orchid/.flutter-plugins
+    - run: debug=crossndk make -j3 -C app-windows ./env/dotdot/gui-orchid/.flutter-plugins-dependencies
     - run: debug=crossndk make -j3 -C app-windows target=win precache='--no-android --no-ios --windows -a'
 
     - uses: actions/upload-artifact@v4
@@ -246,7 +246,7 @@ jobs:
     - run: env/setup.sh
     - uses: ./.github/actions/submodule
 
-    - run: debug=crossndk make -j3 -C app-linux ./env/dotdot/gui-orchid/.flutter-plugins
+    - run: debug=crossndk make -j3 -C app-linux ./env/dotdot/gui-orchid/.flutter-plugins-dependencies
     - run: debug=crossndk make -j3 -C app-linux precache='--no-android --no-ios --linux'
 
     - uses: actions/upload-artifact@v4

.gitmodules

@@ -157,9 +157,6 @@
 [submodule "chains"]
 	path = lib-protocol/chains
 	url = https://github.com/ethereum-lists/chains.git
-[submodule "engine"]
-	path = app-shared/engine
-	url = https://github.com/flutter/engine.git
 [submodule "vpn-libraries"]
 	path = min-krypton/vpn-libraries
 	url = https://github.com/google/vpn-libraries.git

app-android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -27,10 +27,15 @@ subprojects {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def flutter = files(orcFlutter)
+def flutterFile = files(orcFlutter)
+
+ext {
+    flutter = [compileSdkVersion: 34]
+}
 
 android {
-    compileSdkVersion 34
+    namespace "net.orchid.Orchid"
+    compileSdkVersion flutter.compileSdkVersion
 
     defaultConfig {
         applicationId orcUnique
@@ -65,6 +70,14 @@ android {
         targetCompatibility 1.8
     }
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures {
+        buildConfig true
+    }
+
     sourceSets {
         main {
             java.srcDirs += [orcInterface + "/android/app/src/main/java"]
@@ -75,7 +88,7 @@ android {
     }
 
     dependencies {
-        implementation flutter
+        implementation flutterFile
         implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
         implementation "androidx.activity:activity:1.8.1"
@@ -105,19 +118,19 @@ plugins.plugins.android.each { dependency ->
     }
 
     plugin.afterEvaluate {
-        plugin.android { compileSdkVersion 34 }
+        plugin.android { compileSdkVersion flutter.compileSdkVersion }
 
         plugin.android.buildTypes {
             profile {
                 initWith debug
             }
         }
         plugin.dependencies {
-            compileOnly flutter
+            compileOnly flutterFile
 
-            // https://github.com/flutter/flutter/issues/56686
-            // WakelockPlugin.kt: Unresolved reference: NonNull
             implementation "androidx.annotation:annotation:1.0.0"
+            implementation "com.android.support:support-annotations:28.0.0"
+            implementation "org.jetbrains:annotations:24.0.1"
         }
     }
 }

app-android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx3G
 android.enableJetifier=true
 android.useAndroidX=true

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

app-android/local.properties

@@ -0,0 +1 @@
+flutter.sdk=shared/flutter

app-android/makefile

@@ -77,11 +77,12 @@ $(word 1,$(keystore)).keystore:
 endif
 
 $(apk): $(shell find src/main/kotlin -name '*.kt') $(shell find src/main/java -name '*.java') $(shell find src/main/res) build.gradle $(word 1,$(keystore)).keystore src/main/AndroidManifest.xml $(temp) $(subst %,.,$(generated)) $(output)/assets/flutter_assets/AssetManifest.json $(pwd/flutter)/bin/cache/artifacts/engine/android-arm-release/flutter.jar
-	@./gradlew -Pandroid.debug.obsoleteApi=true assemble$(if $(filter noaot,$(debug)),Debug,Release) --console verbose --warning-mode all \
-	    -PorcUnique='$(domain).$(name)' -PorcName='$(name)' -PorcOutput='$(output)' \
+	@FLUTTER_ROOT=$(CURDIR)/shared/flutter ./gradlew assemble$(if $(filter noaot,$(debug)),Debug,Release) \
+	    -Pandroid.debug.obsoleteApi=true --console verbose --warning-mode all \
 	    -PorcStore='$(word 1,$(keystore)).keystore' -PorcAlias='$(word 2,$(keystore))' -PorcPassword='$(word 3,$(keystore))' \
 	    -PorcMonotonic='$(monotonic)' -PorcRevision='$(revision)' -PorcPackage='$(package)' -PorcVersion='$(version)' \
-	    -PorcFlutter=$(pwd/flutter)/bin/cache/artifacts/engine/$(flutter/$(machine))$(engine)/flutter.jar -PorcInterface='$(pwd/gui)'
+	     -PorcFlutter=$(pwd/flutter)/bin/cache/artifacts/engine/$(flutter/$(machine))$(engine)/flutter.jar \
+	    -PorcUnique='$(domain).$(name)' -PorcName='$(name)' -PorcOutput='$(output)' -PorcInterface='$(pwd/gui)'
 	exit 0
 	touch $@
 

app-android/settings.gradle

@@ -1,13 +1,6 @@
-def root = rootProject.projectDir.toPath()
-
-def plugins = new Properties()
-def file = file(orcInterface + "/.flutter-plugins")
-if (file.exists()) {
-    file.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
-
-plugins.each { name, path ->
-    def plugin = root.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = plugin
+import groovy.json.JsonSlurper
+def plugins = new JsonSlurper().parseText(file(orcInterface + "/.flutter-plugins-dependencies").text)
+plugins.plugins.android.each { dependency ->
+    include ":${dependency.name}"
+    project(":${dependency.name}").projectDir = file("${dependency.path}/android")
 }

app-android/src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.orchid.Orchid"
->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.CAMERA" />

app-android/src/main/kotlin/net/orchid/Orchid/MainActivity.kt

@@ -11,7 +11,6 @@ import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugins.GeneratedPluginRegistrant
-import io.flutter.view.FlutterMain
 
 import android.content.Intent;
 import android.net.VpnService;
@@ -87,18 +86,4 @@ class MainActivity(): FlutterActivity() {
     private fun configFile(): File {
         return File(filesDir.absolutePath + "/orchid.cfg");
     }
-
-    fun copyTo(ins: InputStream, dst: File) {
-        ins.use { ins ->
-            val out = FileOutputStream(dst)
-            out.use { out ->
-                // Transfer bytes from in to out
-                val buf = ByteArray(4096)
-                var len: Int = 0
-                while ({ len = ins.read(buf); len }() > 0) {
-                    out.write(buf, 0, len)
-                }
-            }
-        }
-    }
 }