Finish upgrading to the latest version of Flutter.

OrchidTechnologies · Aug 31, 2024 · 1f28827 · 1f28827
1 parent 644a27c
commit 1f28827
Show file tree

Hide file tree

Showing 20 changed files with 175 additions and 179 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -157,6 +157,7 @@ jobs:
     needs: [cache-submodule]
     runs-on: ubuntu-24.04
 
+    if: ${{ false }} # XXX: Flutter 3.24 --windows
     steps:
     - uses: actions/checkout@v4
     - run: env/setup.sh

diff --git a/app-android/build.gradle b/app-android/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -30,12 +30,12 @@ apply plugin: 'kotlin-android'
 def flutter = files(orcFlutter)
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId orcUnique
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode orcMonotonic.toInteger() - 946684800
         versionName orcVersion
         manifestPlaceholders = [orcUnique: orcUnique, orcName: orcName]

diff --git a/app-flutter.mk b/app-flutter.mk
@@ -27,13 +27,18 @@ $(call include,shared/target-all.mk)
 
 $(foreach fork,$(forks),$(shell ln -sf $(patsubst %/pubspec.yaml,%,$(fork)) >/dev/null))
 
+sed := $(shell which gsed sed | head -n1)
+
 .PHONY: create
 create: $(pwd/flutter)/packages/flutter/pubspec.lock
 	$(flutter) create -i objc -a java --no-pub --project-name orchid .
 	$(flutter) pub get
-	sed -ie 's/flutter\.compileSdkVersion/33/g;s/flutter.minSdkVersion/21/g' android/app/build.gradle
-	sed -ie "/^platform :osx/{s/,.*/, '10.15'/g;}" macos/Podfile
-	sed -ie "/MACOSX_DEPLOYMENT_TARGET =/{s/=.*/= 10.15;/g;}" macos/Runner.xcodeproj/project.pbxproj
+	$(sed) -ie 's/flutter\.compileSdkVersion/34/g;s/flutter.minSdkVersion/21/g' android/app/build.gradle
+	$(sed) -ie '0,/subprojects {/s//\0 afterEvaluate { android { compileSdkVersion 34 } }/' android/build.gradle
+	$(sed) -ie '/org\.jetbrains\.kotlin\.android/s/\(version "\)[^"]*/\11.8.0/' android/settings.gradle
+	$(sed) -ie "/^# platform :ios/{s/^# //;}" ios/Podfile
+	$(sed) -ie "/^platform :osx/{s/,.*/, '10.15'/;}" macos/Podfile
+	$(sed) -ie "/MACOSX_DEPLOYMENT_TARGET =/{s/=.*/= 10.15;/g;}" macos/Runner.xcodeproj/project.pbxproj
 
 builds := 
 builds += apk

diff --git a/app-ios/makefile b/app-ios/makefile
@@ -68,7 +68,11 @@ $(call include,shared/target-ios.mk)
 local := 
 local += app.mm.o
 
-local += $(subst %,.,$(word 1,$(generated))).o
+temp := $(subst %,.,$(word 1,$(generated)))
+local += $(temp).o
+
+$(call depend,$(temp).o,$(output)/XCBuildData/build.db)
+cflags/$(temp) += -fmodules $(patsubst %,-fmodule-map-file=%,$(wildcard $(output)/Release-$(sdk)/*/*.modulemap)) -Wno-ignored-attributes
 
 include env/output.mk
 
@@ -139,7 +143,7 @@ $(bundle)/Assets.car: $(wildcard Assets.xcassets/*/*)
 	@mkdir -p $(output)/info
 	# XXX: --launch-image LaunchImage
 	actool --output-format human-readable-text --errors --warnings --notices \
-	    --target-device iphone --target-device ipad --minimum-deployment-target 11.0 \
+	    --target-device iphone --target-device ipad --minimum-deployment-target 12.0 \
 	    --platform iphoneos \
 	    --app-icon AppIcon \
 	    --compress-pngs \

diff --git a/app-shared/ios/Podfile b/app-shared/ios/Podfile
@@ -2,7 +2,7 @@ install! 'cocoapods',
     :integrate_targets => false
 
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/app-shared/target-all.mk b/app-shared/target-all.mk
@@ -26,13 +26,17 @@ flutter := $(CURDIR)/$(pwd/flutter)/bin/flutter --suppress-analytics --verbose -
 
 # -a is needed as flutter (incorrectly) only installs files for windows *target* on windows *host*
 # https://github.com/flutter/flutter/issues/58379
-precache := --android --ios --linux --macos --windows -a
+
+# XXX: ugh. now I had to disable all the windows support due to Failed to download https://storage.googleapis.com/flutter_infra_release/flutter/b8800d88be4866db1b15f8b954ab2573bba9960f/windows-arm64/artifacts.zip. Ensure you have network connectivity and then try again. Exception: 404
+# I actually think I can get them to fix this, as this breaks precache -a even without --windows and even without --enable-windows-desktop
+
+precache := --android --ios --linux --macos #--windows
 
 $(pwd/flutter)/packages/flutter/pubspec.lock: $(pwd/flutter)/packages/flutter/pubspec.yaml $(call head,$(pwd/flutter))
 	cd $(pwd/flutter) && git clean -fxd
 	cd $(pwd/flutter) && bin/flutter config --enable-linux-desktop
 	cd $(pwd/flutter) && bin/flutter config --enable-macos-desktop
-	cd $(pwd/flutter) && bin/flutter config --enable-windows-desktop
+	#cd $(pwd/flutter) && bin/flutter config --enable-windows-desktop
 	cd $(pwd/flutter) && bin/flutter precache $(precache)
 	cd $(pwd/flutter) && bin/flutter update-packages
 

diff --git a/app-shared/target-and.mk b/app-shared/target-and.mk
@@ -20,13 +20,13 @@
 
 assemble := android
 platform := android
+capped := Android
 
 generated := $(pwd/gui)/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant%java
 
 include $(pwd)/target-all.mk
 
 jni := armeabi-v7a arm64-v8a
-#jnis := $(subst $(space),$(comma),$(foreach arch,$(jni),android-$(flutter/$(arch))))
 
 assembled := $(output)/flutter/flutter_assets/AssetManifest%json $(if $(filter noaot,$(debug)),,$(foreach arch,$(jni),$(output)/flutter/$(arch)/app%so))
 $(assembled): $(dart)
@@ -35,6 +35,7 @@ $(assembled): $(dart)
 	    -dTargetPlatform="$(platform)" \
 	    -dTargetFile="lib/main.dart" \
 	    -dBuildMode="$(mode)" \
+	    -d$(capped)Archs="$(foreach arch,$(jni),$(flutter/$(arch)))" \
 	    -dTreeShakeIcons="true" \
 	    -dTrackWidgetCreation="true" \
 	    --output="$(CURDIR)/$(output)/flutter" \

diff --git a/app-shared/target-apl.mk b/app-shared/target-apl.mk
@@ -37,13 +37,8 @@ endif
 
 codesign += && touch $(3)
 
-ifeq ($(target),mac)
-cflags += -F$(engine)
-lflags += -F$(engine)
-else
 cflags += -F$(engine)/$(framework).xcframework/$(xcframework)
 lflags += -F$(engine)/$(framework).xcframework/$(xcframework)
-endif
 
 app := $(bundle)$(contents)/Frameworks/App.framework
 embed := $(bundle)$(contents)/Frameworks/$(framework).framework

diff --git a/env/lnx-arch.sh b/env/lnx-arch.sh
@@ -3,7 +3,7 @@ set -e
 
 pacman -Sy \
     ubuntu-keyring \
-    bc tcl vim \
+    bc sed tcl vim \
     curl git rsync wget \
     fakeroot talloc \
     cpio rpm-tools unzip zstd \

diff --git a/env/lnx-ubuntu.sh b/env/lnx-ubuntu.sh
@@ -6,7 +6,7 @@ apt-get update
 
 apt-get -y install \
     ubuntu-keyring \
-    bc tcl xxd \
+    bc sed tcl xxd \
     curl git-core rsync wget \
     fakeroot libtalloc-dev \
     cpio rpm unzip zstd \

diff --git a/env/setup-mac.sh b/env/setup-mac.sh
@@ -4,6 +4,7 @@ which brew &>/dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubuserconte
 
 # XXX: duplicate linux setup as much as possible
 brew install \
+    gnu-sed \
     fakeroot \
     rpm2cpio zstd \
     binutils \

diff --git a/env/setup-ndk.sh b/env/setup-ndk.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 set -o pipefail
-echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-33" >/dev/null
+echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-34" >/dev/null
diff --git a/env/target-apl.mk b/env/target-apl.mk
@@ -28,9 +28,6 @@ signature := /_CodeSignature/CodeResources
 
 isysroot :=  $(shell xcrun --sdk $(sdk) --show-sdk-path)
 more += -isysroot $(isysroot)
-ifneq ($(sdk),macosx)
-more += -idirafter $(shell xcrun --sdk macosx --show-sdk-path)/usr/include
-endif
 
 define _
 more/$(1) := -arch $(1)

diff --git a/env/target-mac.mk b/env/target-mac.mk
@@ -39,6 +39,8 @@ runtime := osx
 more := -mmacosx-version-min=10.15
 include $(pwd)/target-apl.mk
 
+xcframework := macos-arm64_x86_64
+
 contents := /Contents
 resources := /Resources
 versions := /Versions/A