Skip to content

Commit 3c17545

Browse files
authored
Merge pull request #379 from HannesVDB/feature/gradle-upgrade
feat: gradle upgrade
2 parents 8613124 + 95a93d4 commit 3c17545

6 files changed

Lines changed: 32 additions & 20 deletions

File tree

android/app/build.gradle

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ if (flutterVersionName == null) {
2424
}
2525

2626
android {
27-
buildToolsVersion "30.0.0"
28-
compileSdkVersion 34
27+
buildToolsVersion "34.0.0"
28+
compileSdkVersion 36
29+
ndkVersion "29.0.14033849"
30+
namespace "com.icapps.fluttertemplate"
2931

3032
sourceSets {
3133
main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +41,7 @@ android {
3941
defaultConfig {
4042
applicationId "com.icapps.fluttertemplate"
4143
minSdkVersion flutter.minSdkVersion
42-
targetSdkVersion 34
44+
targetSdkVersion 35
4345
multiDexEnabled true
4446
versionCode flutterVersionCode.toInteger()
4547
versionName flutterVersionName
@@ -93,6 +95,19 @@ android {
9395
dimension "flavors"
9496
}
9597
}
98+
99+
compileOptions {
100+
sourceCompatibility JavaVersion.VERSION_17
101+
targetCompatibility JavaVersion.VERSION_17
102+
}
103+
104+
kotlinOptions {
105+
jvmTarget = JavaVersion.VERSION_17
106+
}
107+
108+
buildFeatures {
109+
buildConfig = true
110+
}
96111
}
97112

98113
flutter {

android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ android.enableJetifier=true
22
android.useAndroidX=true
33
org.gradle.jvmargs=-Xmx1536M
44
android.enableR8=true
5+
kotlin.jvm.target.validation.mode=IGNORE

android/gradle/wrapper/gradle-wrapper.properties

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

android/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
23-
id "com.google.gms.google-services"version "4.3.8" apply false
21+
id "com.android.application" version "8.7.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
23+
id "com.google.gms.google-services"version "4.4.2" apply false
2424
id "com.google.firebase.crashlytics" version "2.9.9" apply false
2525
}
2626

pubspec.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ packages:
514514
dependency: transitive
515515
description:
516516
name: flutter_key_value_file_storage
517-
sha256: a39cb3814eae20aa58747c874235d94411955df4bb287afb3aab12f1f2bbdfe6
517+
sha256: bd41274a2f11e45d146d8f1da7a063790a398007fd2fe404f384b9672e4e2b53
518518
url: "https://pub.dev"
519519
source: hosted
520-
version: "0.0.8"
520+
version: "0.1.0"
521521
flutter_launcher_icons:
522522
dependency: "direct dev"
523523
description:
@@ -559,10 +559,10 @@ packages:
559559
dependency: transitive
560560
description:
561561
name: flutter_secure_file_storage
562-
sha256: ea582e959c9ab8916041bf39c93ce0e5ccbd9e93c38d8424ef48b4cb4dd6a0c6
562+
sha256: b44256b8d599bfbd3404f56729ccd35a800b8b20f7c2a72e2db9c9c00e5ed7fd
563563
url: "https://pub.dev"
564564
source: hosted
565-
version: "1.1.0"
565+
version: "1.2.0"
566566
flutter_secure_storage:
567567
dependency: "direct main"
568568
description:
@@ -840,11 +840,10 @@ packages:
840840
log_to_secure_file:
841841
dependency: "direct main"
842842
description:
843-
path: "."
844-
ref: main
845-
resolved-ref: "44e7f61a7c31e474274f613fcdd15bdd758e8a50"
846-
url: "https://github.com/icapps/log_to_secure_file.git"
847-
source: git
843+
name: log_to_secure_file
844+
sha256: "28d5e7330d0e8271b8e4d86538db3941e7f637da1b3ba0898f708a28dfb0e2c6"
845+
url: "https://pub.dev"
846+
source: hosted
848847
version: "1.0.0"
849848
logger:
850849
dependency: transitive

pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ dependencies:
4141
injectable: ^2.1.0
4242
intl: ^0.19.0
4343
json_annotation: ^4.7.0
44-
log_to_secure_file:
45-
git:
46-
url: https://github.com/icapps/log_to_secure_file.git
47-
ref: main
44+
log_to_secure_file: ^1.0.0
4845
niddler_dart: ^1.6.0
4946
path: ^1.8.2
5047
path_provider: ^2.0.11

0 commit comments

Comments
 (0)