Skip to content

Commit 5dfec8a

Browse files
committed
upgrade: up to Flutter 3.35.3
1 parent 380e06e commit 5dfec8a

File tree

127 files changed

+4961
-3202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4961
-3202
lines changed

.idea/runConfigurations/main_dart.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.metadata

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,27 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 9b2d32b605630f28625709ebd9d78ab3016b2bf6
8-
channel: stable
7+
revision: "a402d9a4376add5bc2d6b1e33e53edaae58c07f8"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
17+
base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
18+
- platform: macos
19+
create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
20+
base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

android/app/build.gradle

Lines changed: 0 additions & 120 deletions
This file was deleted.

android/app/build.gradle.kts

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
import java.util.Properties
2+
import java.io.FileInputStream
3+
4+
plugins {
5+
id("com.android.application")
6+
id("kotlin-android")
7+
id("dev.flutter.flutter-gradle-plugin")
8+
}
9+
10+
val keystoreProperties = Properties()
11+
val keystorePropertiesFile = rootProject.file("key.properties")
12+
if (keystorePropertiesFile.exists()) {
13+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
14+
}
15+
16+
android {
17+
namespace = "com.example.verygoodcore.marvel"
18+
compileSdk = flutter.compileSdkVersion
19+
ndkVersion = flutter.ndkVersion
20+
21+
compileOptions {
22+
sourceCompatibility = JavaVersion.VERSION_11
23+
targetCompatibility = JavaVersion.VERSION_11
24+
}
25+
26+
kotlinOptions {
27+
jvmTarget = JavaVersion.VERSION_11.toString()
28+
}
29+
30+
defaultConfig {
31+
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
32+
applicationId = "com.example.verygoodcore.marvel"
33+
// You can update the following values to match your application needs.
34+
// For more information, see: https://flutter.dev/to/review-gradle-config.
35+
minSdk = flutter.minSdkVersion
36+
targetSdk = flutter.targetSdkVersion
37+
versionCode = flutter.versionCode
38+
versionName = flutter.versionName
39+
40+
ndkVersion = "27.0.12077973"
41+
}
42+
43+
signingConfigs {
44+
create("release") {
45+
if (System.getenv("ANDROID_KEYSTORE_PATH") != null) {
46+
storeFile = file(System.getenv("ANDROID_KEYSTORE_PATH"))
47+
keyAlias = System.getenv("ANDROID_KEYSTORE_ALIAS")
48+
keyPassword = System.getenv("ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
49+
storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
50+
51+
} else {
52+
keyAlias = keystoreProperties["keyAlias"] as String?
53+
keyPassword = keystoreProperties["keyPassword"] as String?
54+
storeFile = keystoreProperties["storeFile"]?.let { file(it) }
55+
storePassword = keystoreProperties["storePassword"] as String?
56+
}
57+
}
58+
}
59+
60+
flavorDimensions += "default"
61+
productFlavors {
62+
create("production") {
63+
dimension = "default"
64+
applicationIdSuffix = ""
65+
manifestPlaceholders["appName"] = "Marvel"
66+
}
67+
create("staging") {
68+
dimension = "default"
69+
applicationIdSuffix = ".stg"
70+
manifestPlaceholders["appName"] = "[STG] Marvel"
71+
}
72+
create("development") {
73+
dimension = "default"
74+
applicationIdSuffix = ".dev"
75+
manifestPlaceholders["appName"] = "[DEV] Marvel"
76+
}
77+
}
78+
79+
buildTypes {
80+
getByName("release") {
81+
signingConfig = signingConfigs.getByName("release")
82+
isMinifyEnabled = true
83+
proguardFiles(
84+
getDefaultProguardFile("proguard-android.txt"),
85+
"proguard-rules.pro"
86+
)
87+
}
88+
getByName("debug") {
89+
signingConfig = signingConfigs.getByName("debug")
90+
}
91+
}
92+
}
93+
94+
flutter {
95+
source = "../.."
96+
}
97+
98+
dependencies {
99+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20")
100+
}

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.verygoodcore.marvel">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<application
43
android:label="${appName}"
54
android:icon="@mipmap/launcher_icon"

android/build.gradle

Lines changed: 0 additions & 29 deletions
This file was deleted.

android/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
allprojects {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
}
6+
}
7+
8+
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
9+
rootProject.layout.buildDirectory.value(newBuildDir)
10+
11+
subprojects {
12+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
13+
project.layout.buildDirectory.value(newSubprojectBuildDir)
14+
}
15+
subprojects {
16+
project.evaluationDependsOn(":app")
17+
}
18+
19+
tasks.register<Delete>("clean") {
20+
delete(rootProject.layout.buildDirectory)
21+
}

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ 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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
7+

android/settings.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)