Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.24.0"
"flutter": "3.38.9"
}
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"dart.flutterSdkPath": ".fvm/flutter_sdk",
"dart.sdkPath": ".fvm/flutter_sdk/bin/cache/dart-sdk",
"dart.lineLength": 180,
// Remove .fvm files from search
"search.exclude": {
"**/.fvm": true
Expand Down
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ linter:
rules:
- unawaited_futures
- always_declare_return_types
- unsafe_html
- use_full_hex_values_for_flutter_colors
- prefer_final_in_for_each
- prefer_final_fields
Expand Down
21 changes: 18 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ if (flutterVersionName == null) {
}

android {
buildToolsVersion "30.0.0"
compileSdkVersion 34
buildToolsVersion "34.0.0"
compileSdkVersion 36
ndkVersion "29.0.14033849"
namespace "com.icapps.fluttertemplate"

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -39,7 +41,7 @@ android {
defaultConfig {
applicationId "com.icapps.fluttertemplate"
minSdkVersion flutter.minSdkVersion
targetSdkVersion 34
targetSdkVersion 35
multiDexEnabled true
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down Expand Up @@ -93,6 +95,19 @@ android {
dimension "flavors"
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
}

buildFeatures {
buildConfig = true
}
}

flutter {
Expand Down
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
kotlin.jvm.target.validation.mode=IGNORE
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
6 changes: 3 additions & 3 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
id "com.google.gms.google-services"version "4.3.8" apply false
id "com.android.application" version "8.7.0" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
id "com.google.gms.google-services"version "4.4.2" apply false
id "com.google.firebase.crashlytics" version "2.9.9" apply false
}

Expand Down
Loading