Skip to content

Commit 40b4cc8

Browse files
sauriksaurik
committed
Polishing loose ends on recent dependency updates.
1 parent eaa1918 commit 40b4cc8

File tree

10 files changed

+31
-29
lines changed

10 files changed

+31
-29
lines changed

‎.github/actions/nerdctl/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ runs:
33
steps:
44
- run: brew install lima lima-additional-guestagents
55
shell: bash
6-
- run: limactl start default --arch=x86_64
6+
- run: limactl start default
77
shell: bash
88
- run: echo "ENV_DOCKER=nerdctl.lima" >>"${GITHUB_ENV}"
99
shell: bash

‎app-android/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.10'
2+
ext.kotlin_version = '2.2.20'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.7.0'
9+
classpath 'com.android.tools.build:gradle:8.9.1'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
3030
def flutterFile = files(orcFlutter)
3131

3232
ext {
33-
flutter = [compileSdkVersion: 34]
33+
flutter = [compileSdkVersion: 36]
3434
}
3535

3636
android {
@@ -39,7 +39,7 @@ android {
3939

4040
defaultConfig {
4141
applicationId orcUnique
42-
minSdkVersion 21
42+
minSdkVersion 24
4343
targetSdkVersion 34
4444
versionCode orcMonotonic.toInteger() - 946684800
4545
versionName orcVersion

‎app-flutter.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ $(foreach fork,$(forks),$(shell ln -sf $(patsubst %/pubspec.yaml,%,$(fork)) >/de
3030
sed := $(shell which gsed sed | head -n1)
3131

3232
.PHONY: create
33-
create: $(pwd/flutter)/packages/flutter/pubspec.lock
33+
create: $(pwd/flutter)/packages/flutter_tools/pubspec.lock
3434
$(flutter) create -i objc -a java --no-pub --project-name orchid .
3535
$(flutter) pub get
36-
$(sed) -ie 's/flutter\.compileSdkVersion/34/g;s/flutter.minSdkVersion/21/g' android/app/build.gradle.kts
37-
$(sed) -ie '/org\.jetbrains\.kotlin\.android/s/\(version "\)[^"]*/\11.8.10/' android/settings.gradle.kts
36+
$(sed) -ie 's/flutter\.compileSdkVersion/36/g;s/flutter.minSdkVersion/24/g' android/app/build.gradle.kts
37+
$(sed) -ie '/org\.jetbrains\.kotlin\.android/s/\(version "\)[^"]*/\12.2.20/' android/settings.gradle.kts
3838
$(sed) -ie "/^# platform :ios/{s/^# //;}" ios/Podfile
3939
$(sed) -ie "/^platform :osx/{s/,.*/, '10.15'/;}" macos/Podfile
4040
$(sed) -ie "/MACOSX_DEPLOYMENT_TARGET =/{s/=.*/= 10.15;/g;}" macos/Runner.xcodeproj/project.pbxproj

‎app-shared/target-all.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ flutter := $(CURDIR)/$(pwd/flutter)/bin/flutter --suppress-analytics --verbose -
3232

3333
precache := --android --ios --linux --macos #--windows
3434

35-
$(pwd/flutter)/packages/flutter/pubspec.lock: $(pwd/flutter)/packages/flutter/pubspec.yaml $(call head,$(pwd/flutter))
35+
$(pwd/flutter)/packages/flutter_tools/pubspec.lock: $(pwd/flutter)/packages/flutter_tools/pubspec.yaml $(call head,$(pwd/flutter))
3636
cd $(pwd/flutter) && git clean -fxd
3737
cd $(pwd/flutter) && bin/flutter config --enable-linux-desktop
3838
cd $(pwd/flutter) && bin/flutter config --enable-macos-desktop
@@ -46,14 +46,14 @@ dart += $(pwd/gui)/.flutter-plugins-dependencies
4646
dart += $(pwd/gui)/.packages
4747

4848
# XXX: use $(dart) to generate the first three of these
49-
$(pwd/gui)/.dart_tool/package_config%json $(pwd/gui)/%flutter-plugins-dependencies $(pwd/gui)/%packages $(generated): $(pwd/gui)/pubspec.yaml $(pwd/gui)/pubspec.lock $(pwd/flutter)/packages/flutter/pubspec.lock $(forks)
49+
$(pwd/gui)/.dart_tool/package_config%json $(pwd/gui)/%flutter-plugins-dependencies $(pwd/gui)/%packages $(generated): $(pwd/gui)/pubspec.yaml $(pwd/gui)/pubspec.lock $(pwd/flutter)/packages/flutter_tools/pubspec.lock $(forks)
5050
@mkdir -p $(pwd/gui)/{android,ios,linux,macos,windows}
5151
@rm -f $(pwd/gui)/.flutter-plugins-dependencies
5252
! grep ': ^' $(pwd/gui)/pubspec.yaml
5353
cd $(pwd/gui) && $(flutter) pub get
5454
@touch $(pwd/gui)/.packages
5555

56-
dart += $(pwd/flutter)/packages/flutter/pubspec.lock
56+
dart += $(pwd/flutter)/packages/flutter_tools/pubspec.lock
5757
dart += $(shell find $(pwd/gui)/lib/ -name '*.dart' -o -name '*.arb')
5858

5959
ifeq ($(filter noaot,$(debug)),)

‎env/target-and.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif
4949

5050
include $(pwd)/target-elf.mk
5151

52-
aver := 21
52+
aver := 24
5353

5454
ifeq ($(uname-o),Android)
5555

‎env/target-ios.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ endif
2929

3030
sdk := iphoneos
3131
runtime := ios
32-
more := -miphoneos-version-min=12.0
32+
more := -miphoneos-version-min=13.0
3333
include $(pwd)/target-apl.mk
3434

3535
support := iPhoneOS

‎env/target-win.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ qflags += -I$(CURDIR)/$(pwd)/mingw
113113
# XXX: I need gcc as I don't have windows compiler-rt in NDK
114114
#qflags += --rtlib=compiler-rt
115115

116-
mingw := git-11.0.0.r680.g257321cea
116+
mingw := 13.0.0.r505.g7d006b2ea
117117

118118
msys2 :=
119119
msys2 += crt-$(mingw)-1
120120
msys2 += dlfcn-1.4.2-1
121-
msys2 += gcc-13.2.0-5
121+
msys2 += gcc-15.2.0-11
122122
msys2 += headers-$(mingw)-1
123123
msys2 += winpthreads-$(mingw)-1
124124

‎gui-orchid/ios/Podfile.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,24 @@ EXTERNAL SOURCES:
109109

110110
SPEC CHECKSUMS:
111111
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
112-
flutter_js: 867813c1830e1d9b2c5d547cdb6f61801e2f2145
112+
flutter_js: 95929d4e146e8ceb1c8e1889d8c2065c5d840076
113113
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
114114
GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
115115
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
116116
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
117117
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
118118
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
119-
in_app_purchase_storekit: 22cca7d08eebca9babdf4d07d0baccb73325d3c8
119+
in_app_purchase_storekit: 2342c0a5da86593124d08dd13d920f39a52b273a
120120
MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
121121
MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
122122
MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
123123
MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
124-
mobile_scanner: 7600234c6d2b55f53f08616dff2fd1b8bb8df015
124+
mobile_scanner: 131a34df36b024cc53457809fb991700f16f72d7
125125
nanopb: 438bc412db1928dac798aa6fd75726007be04262
126126
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
127-
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
128-
sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
129-
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
127+
shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
128+
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
129+
url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
130130

131131
PODFILE CHECKSUM: e854c75592f29022e0e97bd47405bae3759dd8e1
132132

‎gui-orchid/macos/Podfile.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ EXTERNAL SOURCES:
4747
:path: Flutter/ephemeral/.symlinks/plugins/window_size/macos
4848

4949
SPEC CHECKSUMS:
50-
flutter_js: 79c3c70d33ba464c67d8eb88639a61aa718cd8b8
51-
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
52-
in_app_purchase_storekit: e3aa97dd8b05816b844c816bec5ad62608b2812e
53-
mobile_scanner: 02d3360a57298e7f1826fd14ea0c735f44245b00
54-
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
55-
sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
56-
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
57-
window_size: 4bd15034e6e3d0720fd77928a7c42e5492cfece9
50+
flutter_js: c664361655af1d8fc24e278c7d086e9cbe0d68bc
51+
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
52+
in_app_purchase_storekit: 2342c0a5da86593124d08dd13d920f39a52b273a
53+
mobile_scanner: 4d1f08373cb0321594c81c7709aa460c17b8b84f
54+
shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
55+
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
56+
url_launcher_macos: 175a54c831f4375a6cf895875f716ee5af3888ce
57+
window_size: 339dafa0b27a95a62a843042038fa6c3c48de195
5858

5959
PODFILE CHECKSUM: ce32ab99a0089086c289cf0789c8382f403ce92b
6060

‎lib-protocol/extra/lwip/errno.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#undef LWIP_PROVIDE_ERRNO
2+
#include_next "lwip/errno.h"

0 commit comments

Comments
 (0)