Skip to content

Commit 9674c97

Browse files
committed
updates to fix example app compilation
1 parent e7604a6 commit 9674c97

File tree

11 files changed

+127
-121
lines changed

11 files changed

+127
-121
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,5 @@ app.*.map.json
121121
# Android Studio will place build artifacts here
122122
/android/app/debug
123123
/android/app/profile
124-
/android/app/release
124+
/android/app/release
125+
.cxx/

android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ apply plugin: 'com.android.library'
2626
apply plugin: 'kotlin-android'
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 35
30+
31+
namespace "io.abner.flutter_js"
3032

3133
kotlinOptions {
3234
jvmTarget = JavaVersion.VERSION_1_8.toString()

example/android/app/build.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,14 +22,11 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
26+
namespace "io.abner.flutter_js_example"
2927
compileSdkVersion flutter.compileSdkVersion
3028

31-
ndkVersion "21.3.6528147"
29+
ndkVersion "27.0.12077973"
3230

3331

3432
compileOptions {
@@ -84,7 +82,7 @@ android {
8482
signingConfig signingConfigs.debug
8583

8684
minifyEnabled true
87-
useProguard true
85+
shrinkResources true
8886

8987
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
9088
}
@@ -96,7 +94,6 @@ flutter {
9694
}
9795

9896
dependencies {
99-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
10097
// implementation "com.github.fast-development.android-js-runtimes:fastdev-jsruntimes-jsc-intl:0.3.5"
10198
implementation "com.github.fast-development.android-js-runtimes:fastdev-jsruntimes-jsc:0.3.5"
10299
}

example/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.6.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Sat Feb 22 21:40:47 GMT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.7.3" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.10" apply false
23+
}
24+
25+
include ":app"

example/macos/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414
:path: Flutter/ephemeral
1515

1616
SPEC CHECKSUMS:
17-
flutter_js: c664361655af1d8fc24e278c7d086e9cbe0d68bc
17+
flutter_js: 79c3c70d33ba464c67d8eb88639a61aa718cd8b8
1818
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
1919

2020
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
2121

22-
COCOAPODS: 1.12.1
22+
COCOAPODS: 1.16.2

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

example/pubspec.lock

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
8+
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.11.0"
11+
version: "2.12.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
1515
name: boolean_selector
16-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
16+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "2.1.1"
19+
version: "2.1.2"
2020
characters:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
24+
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.3.0"
27+
version: "1.4.0"
2828
charcode:
2929
dependency: transitive
3030
description:
@@ -37,18 +37,18 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: clock
40-
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
40+
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.1.1"
43+
version: "1.1.2"
4444
collection:
4545
dependency: transitive
4646
description:
4747
name: collection
48-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
48+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.18.0"
51+
version: "1.19.1"
5252
cupertino_icons:
5353
dependency: "direct main"
5454
description:
@@ -61,10 +61,10 @@ packages:
6161
dependency: transitive
6262
description:
6363
name: fake_async
64-
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
64+
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
6565
url: "https://pub.dev"
6666
source: hosted
67-
version: "1.3.1"
67+
version: "1.3.2"
6868
ffi:
6969
dependency: transitive
7070
description:
@@ -84,7 +84,7 @@ packages:
8484
path: ".."
8585
relative: true
8686
source: path
87-
version: "0.8.1"
87+
version: "0.8.2"
8888
flutter_lints:
8989
dependency: "direct dev"
9090
description:
@@ -118,18 +118,18 @@ packages:
118118
dependency: transitive
119119
description:
120120
name: leak_tracker
121-
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
121+
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
122122
url: "https://pub.dev"
123123
source: hosted
124-
version: "10.0.4"
124+
version: "10.0.8"
125125
leak_tracker_flutter_testing:
126126
dependency: transitive
127127
description:
128128
name: leak_tracker_flutter_testing
129-
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
129+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
130130
url: "https://pub.dev"
131131
source: hosted
132-
version: "3.0.3"
132+
version: "3.0.9"
133133
leak_tracker_testing:
134134
dependency: transitive
135135
description:
@@ -150,71 +150,71 @@ packages:
150150
dependency: transitive
151151
description:
152152
name: matcher
153-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
153+
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
154154
url: "https://pub.dev"
155155
source: hosted
156-
version: "0.12.16+1"
156+
version: "0.12.17"
157157
material_color_utilities:
158158
dependency: transitive
159159
description:
160160
name: material_color_utilities
161-
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
161+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
162162
url: "https://pub.dev"
163163
source: hosted
164-
version: "0.8.0"
164+
version: "0.11.1"
165165
meta:
166166
dependency: transitive
167167
description:
168168
name: meta
169-
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
169+
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
170170
url: "https://pub.dev"
171171
source: hosted
172-
version: "1.12.0"
172+
version: "1.16.0"
173173
path:
174174
dependency: transitive
175175
description:
176176
name: path
177-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
177+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
178178
url: "https://pub.dev"
179179
source: hosted
180-
version: "1.9.0"
180+
version: "1.9.1"
181181
sky_engine:
182182
dependency: transitive
183183
description: flutter
184184
source: sdk
185-
version: "0.0.99"
185+
version: "0.0.0"
186186
source_span:
187187
dependency: transitive
188188
description:
189189
name: source_span
190-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
190+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
191191
url: "https://pub.dev"
192192
source: hosted
193-
version: "1.10.0"
193+
version: "1.10.1"
194194
stack_trace:
195195
dependency: transitive
196196
description:
197197
name: stack_trace
198-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
198+
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
199199
url: "https://pub.dev"
200200
source: hosted
201-
version: "1.11.1"
201+
version: "1.12.1"
202202
stream_channel:
203203
dependency: transitive
204204
description:
205205
name: stream_channel
206-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
206+
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
207207
url: "https://pub.dev"
208208
source: hosted
209-
version: "2.1.2"
209+
version: "2.1.4"
210210
string_scanner:
211211
dependency: transitive
212212
description:
213213
name: string_scanner
214-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
214+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
215215
url: "https://pub.dev"
216216
source: hosted
217-
version: "1.2.0"
217+
version: "1.4.1"
218218
sync_http:
219219
dependency: transitive
220220
description:
@@ -227,18 +227,18 @@ packages:
227227
dependency: transitive
228228
description:
229229
name: term_glyph
230-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
230+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
231231
url: "https://pub.dev"
232232
source: hosted
233-
version: "1.2.1"
233+
version: "1.2.2"
234234
test_api:
235235
dependency: transitive
236236
description:
237237
name: test_api
238-
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
238+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
239239
url: "https://pub.dev"
240240
source: hosted
241-
version: "0.7.0"
241+
version: "0.7.4"
242242
typed_data:
243243
dependency: transitive
244244
description:
@@ -259,10 +259,10 @@ packages:
259259
dependency: transitive
260260
description:
261261
name: vm_service
262-
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
262+
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
263263
url: "https://pub.dev"
264264
source: hosted
265-
version: "14.2.1"
265+
version: "14.3.1"
266266
sdks:
267-
dart: ">=3.3.0 <4.0.0"
267+
dart: ">=3.7.0-0 <4.0.0"
268268
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)