Skip to content

Commit c8400d0

Browse files
Mirgrate to newer Flutter and Android Studio versions
1 parent 03673d0 commit c8400d0

26 files changed

+270
-269
lines changed

.metadata

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

66
version:
7-
revision: "e1e47221e86272429674bec4f1bd36acc4fc7b77"
7+
revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,11 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
17-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
16+
create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
17+
base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
1818
- platform: android
19-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
20-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
21-
- platform: ios
22-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
23-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
24-
- platform: linux
25-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
26-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
27-
- platform: macos
28-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
29-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
30-
- platform: web
31-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
32-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
33-
- platform: windows
34-
create_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
35-
base_revision: e1e47221e86272429674bec4f1bd36acc4fc7b77
19+
create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
20+
base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
3621

3722
# User provided section
3823

android/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
# See https://flutter.dev/to/reference-keystore
1112
key.properties
1213
**/*.keystore
1314
**/*.jks

android/.idea/.gitignore

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

android/.idea/gradle.xml

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

android/.idea/jarRepositories.xml

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

android/.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/misc.xml

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

android/.idea/vcs.xml

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

android/app/build.gradle

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

android/app/build.gradle.kts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id("com.android.application")
3+
id("kotlin-android")
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id("dev.flutter.flutter-gradle-plugin")
6+
}
7+
8+
android {
9+
namespace = "com.softcodingforyou.touchtorch"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = "28.0.13004108"
12+
13+
compileOptions {
14+
sourceCompatibility = JavaVersion.VERSION_11
15+
targetCompatibility = JavaVersion.VERSION_11
16+
}
17+
18+
kotlinOptions {
19+
jvmTarget = JavaVersion.VERSION_11.toString()
20+
}
21+
22+
defaultConfig {
23+
applicationId = "com.softcodingforyou.touchtorch"
24+
// You can update the following values to match your application needs.
25+
// For more information, see: https://flutter.dev/to/review-gradle-config.
26+
minSdk = 23 // torch_light requires >= 23
27+
targetSdk = flutter.targetSdkVersion
28+
versionCode = flutter.versionCode
29+
versionName = flutter.versionName
30+
}
31+
32+
buildTypes {
33+
release {
34+
// TODO: Add your own signing config for the release build.
35+
// Signing with the debug keys for now, so `flutter run --release` works.
36+
signingConfig = signingConfigs.getByName("debug")
37+
}
38+
}
39+
}
40+
41+
flutter {
42+
source = "../.."
43+
}

0 commit comments

Comments
 (0)