Skip to content

Commit e744775

Browse files
committed
Migrated project and example app to latest Gradle build settings, bumped min iOS version to 15+, updated dependency versions, etc. Now builds correctly with latest Flutter version (3.29.1)
1 parent 9a26fb6 commit e744775

File tree

12 files changed

+155
-153
lines changed

12 files changed

+155
-153
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ migrate_working_dir/
1515
*.ipr
1616
*.iws
1717
.idea/
18+
*.cxx
1819

1920
# The .vscode folder contains launch configuration and tasks you configure in
2021
# VS Code which you may wish to be included in version control, so this line

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

example/android/app/build.gradle

Lines changed: 6 additions & 10 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,10 +22,6 @@ 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 {
2926
compileSdkVersion flutter.compileSdkVersion
3027
ndkVersion flutter.ndkVersion
@@ -68,5 +65,4 @@ flutter {
6865
}
6966

7067
dependencies {
71-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7268
}

example/android/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.25'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.2'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
131

142
allprojects {
153
repositories {

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.1.2" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.25" apply false
23+
}
24+
25+
include ":app"

example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '13.0'
2+
platform :ios, '16.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PODS:
22
- audio_session (0.0.1):
33
- Flutter
44
- Flutter (1.0.0)
5-
- flutter_sound (9.9.5):
5+
- flutter_sound (9.24.5):
66
- Flutter
7-
- flutter_sound_core (= 9.9.5)
8-
- flutter_sound_core (9.9.5)
7+
- flutter_sound_core (= 9.24.5)
8+
- flutter_sound_core (9.24.5)
99
- path_provider_foundation (0.0.1):
1010
- Flutter
1111
- FlutterMacOS
@@ -36,13 +36,13 @@ EXTERNAL SOURCES:
3636
:path: ".symlinks/plugins/permission_handler_apple/ios"
3737

3838
SPEC CHECKSUMS:
39-
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
39+
audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
4040
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
41-
flutter_sound: 2bbfd392d7a1f5481b38b35bc5a1748a577a5fd4
42-
flutter_sound_core: 64268d83e2ff12fb500d574e078b98dd00428ed9
41+
flutter_sound: 40d54a7c8a5d680234dde4dd26593bf4b4ce1082
42+
flutter_sound_core: 68fa54fa26446f73eee9c15344c1c018cfc9e98d
4343
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
4444
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
4545

46-
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
46+
PODFILE CHECKSUM: ae273562e2241d2b1bd4b6d2d349a48b8fe1a2a7
4747

4848
COCOAPODS: 1.15.2

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
DEVELOPMENT_TEAM = MPR54D573H;
382382
ENABLE_BITCODE = NO;
383383
INFOPLIST_FILE = Runner/Info.plist;
384-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
384+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
385385
LD_RUNPATH_SEARCH_PATHS = (
386386
"$(inherited)",
387387
"@executable_path/Frameworks",
@@ -515,7 +515,7 @@
515515
DEVELOPMENT_TEAM = MPR54D573H;
516516
ENABLE_BITCODE = NO;
517517
INFOPLIST_FILE = Runner/Info.plist;
518-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
518+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
519519
LD_RUNPATH_SEARCH_PATHS = (
520520
"$(inherited)",
521521
"@executable_path/Frameworks",
@@ -539,7 +539,7 @@
539539
DEVELOPMENT_TEAM = MPR54D573H;
540540
ENABLE_BITCODE = NO;
541541
INFOPLIST_FILE = Runner/Info.plist;
542-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
542+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
543543
LD_RUNPATH_SEARCH_PATHS = (
544544
"$(inherited)",
545545
"@executable_path/Frameworks",

example/ios/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">

0 commit comments

Comments
 (0)