Skip to content

Commit 7543bfa

Browse files
committed
Android 15
1 parent 516595a commit 7543bfa

11 files changed

Lines changed: 180 additions & 175 deletions

File tree

android/app/build.gradle

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
id "com.google.gms.google-services"
6+
id "com.google.firebase.crashlytics"
7+
}
8+
19
def localProperties = new Properties()
210
def localPropertiesFile = rootProject.file('local.properties')
311
if (localPropertiesFile.exists()) {
@@ -6,11 +14,6 @@ if (localPropertiesFile.exists()) {
614
}
715
}
816

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-
1417
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1518
if (flutterVersionCode == null) {
1619
flutterVersionCode = '1'
@@ -21,17 +24,10 @@ if (flutterVersionName == null) {
2124
flutterVersionName = '1.0'
2225
}
2326

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'com.google.gms.google-services'
26-
apply plugin: 'com.google.firebase.crashlytics'
27-
apply plugin: 'kotlin-android'
28-
apply plugin: 'kotlinx-serialization'
29-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
30-
3127
android {
3228
namespace "com.feelsoftware.slidemix"
33-
compileSdk 34
34-
buildToolsVersion = '34.0.0'
29+
compileSdk 35
30+
buildToolsVersion = '35.0.0'
3531
ndkVersion flutter.ndkVersion
3632

3733
compileOptions {
@@ -49,10 +45,10 @@ android {
4945

5046
defaultConfig {
5147
minSdkVersion 24
52-
targetSdkVersion 34
48+
targetSdkVersion 35
5349
versionCode flutterVersionCode.toInteger()
5450
versionName flutterVersionName
55-
resConfigs 'en', 'uk'
51+
resourceConfigurations += ['en', 'uk']
5652
}
5753

5854
buildTypes {
@@ -76,6 +72,5 @@ flutter {
7672
}
7773

7874
dependencies {
79-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
80-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
75+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
8176
}

android/build.gradle

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
buildscript {
2-
ext {
3-
kotlin_version = '1.9.0'
4-
serialization_version = '1.6.0-RC'
5-
}
6-
repositories {
7-
google()
8-
mavenCentral()
9-
}
10-
11-
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.4.2'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
15-
classpath "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
16-
classpath 'com.google.gms:google-services:4.3.15'
17-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
18-
}
19-
}
20-
211
allprojects {
222
repositories {
233
google()

android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

android/settings.gradle

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
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.5.1" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.24" apply false
23+
id "org.jetbrains.kotlin.plugin.serialization" version "1.9.24" apply false
24+
id "com.google.gms.google-services" version "4.4.2" apply false
25+
id "com.google.firebase.crashlytics" version "3.0.2" apply false
26+
}
27+
28+
include ":app"

ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

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, '11.0'
2+
platform :ios, '13.0'
33

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

0 commit comments

Comments
 (0)