Skip to content

Commit 41f9cea

Browse files
cevhericevheri
committed
build: upgrade android version
1 parent bf6d147 commit 41f9cea

33 files changed

+149
-242
lines changed

‎.github/workflows/build_and_test.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- main
66
- unittest
7+
- android-upgrade
78
pull_request:
89
branches:
910
- main
@@ -29,7 +30,7 @@ jobs:
2930
run: flutter analyze
3031
- name: Run tests
3132
run: flutter test
32-
# - name: Build APK
33-
# run: flutter build apk --release --target lib/main/main_prod.dart
34-
# - name: Build Android App Bundle
35-
# run: flutter build appbundle --release --target lib/main/main_prod.dart
33+
- name: Build APK
34+
run: flutter build apk --release --target lib/main/main_prod.dart
35+
- name: Build Android App Bundle
36+
run: flutter build appbundle --release --target lib/main/main_prod.dart

‎.metadata

+15-15
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: "367f9ea16bfae1ca451b9cc27c1366870b187ae2"
7+
revision: "603104015dd692ea3403755b55d07813d5cf8965"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
17-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
16+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
17+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
1818
- platform: android
19-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
20-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
19+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
20+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
2121
- platform: ios
22-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
23-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
22+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
23+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
2424
- platform: linux
25-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
26-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
25+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
26+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
2727
- platform: macos
28-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
29-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
28+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
29+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
3030
- platform: web
31-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
32-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
31+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
32+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
3333
- platform: windows
34-
create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
35-
base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
34+
create_revision: 603104015dd692ea3403755b55d07813d5cf8965
35+
base_revision: 603104015dd692ea3403755b55d07813d5cf8965
3636

3737
# User provided section
3838

‎android/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

‎android/app/build.gradle

+12-35
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,44 @@
11
plugins {
22
id "com.android.application"
33
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
45
id "dev.flutter.flutter-gradle-plugin"
56
}
67

7-
def localProperties = new Properties()
8-
def localPropertiesFile = rootProject.file('local.properties')
9-
if (localPropertiesFile.exists()) {
10-
localPropertiesFile.withReader('UTF-8') { reader ->
11-
localProperties.load(reader)
12-
}
13-
}
14-
15-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
16-
if (flutterVersionCode == null) {
17-
flutterVersionCode = '1'
18-
}
19-
20-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
21-
if (flutterVersionName == null) {
22-
flutterVersionName = '1.0'
23-
}
24-
258
android {
269
namespace = "com.cevheri.flutter.flutter_bloc_advance"
27-
compileSdkVersion = flutter.compileSdkVersion
10+
compileSdk = flutter.compileSdkVersion
2811
ndkVersion = flutter.ndkVersion
2912

3013
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
3316
}
3417

3518
kotlinOptions {
3619
jvmTarget = JavaVersion.VERSION_1_8
3720
}
3821

39-
sourceSets {
40-
main.java.srcDirs += 'src/main/kotlin'
41-
}
42-
4322
defaultConfig {
4423
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
45-
applicationId "com.cevheri.flutter.flutter_bloc_advance"
24+
applicationId = "com.cevheri.flutter.flutter_bloc_advance"
4625
// You can update the following values to match your application needs.
47-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
48-
minSdkVersion 30
49-
targetSdkVersion flutter.targetSdkVersion
50-
versionCode flutterVersionCode.toInteger()
51-
versionName flutterVersionName
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
5231
}
5332

5433
buildTypes {
5534
release {
5635
// TODO: Add your own signing config for the release build.
5736
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
5938
}
6039
}
6140
}
6241

6342
flutter {
64-
source '../..'
43+
source = "../.."
6544
}
66-
67-
dependencies {}

‎android/app/src/main/AndroidManifest.xml

+12
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:name=".MainActivity"
88
android:exported="true"
99
android:launchMode="singleTop"
10+
android:taskAffinity=""
1011
android:theme="@style/LaunchTheme"
1112
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1213
android:hardwareAccelerated="true"
@@ -30,4 +31,15 @@
3031
android:name="flutterEmbedding"
3132
android:value="2" />
3233
</application>
34+
<!-- Required to query activities that can process text, see:
35+
https://developer.android.com/training/package-visibility and
36+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
37+
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
39+
<queries>
40+
<intent>
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
43+
</intent>
44+
</queries>
3345
</manifest>

‎android/app/src/main/kotlin/com/cevheri/flutter/flutter_bloc_advance/MainActivity.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.cevheri.flutter.flutter_bloc_advance
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎android/build.gradle

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
buildscript {
2-
ext.kotlin_version = "1.8.22"
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.7.2'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
174
mavenCentral()
185
}
196
}
207

21-
rootProject.buildDir = '../build'
8+
rootProject.buildDir = "../build"
229
subprojects {
2310
project.buildDir = "${rootProject.buildDir}/${project.name}"
2411
}
2512
subprojects {
26-
project.evaluationDependsOn(':app')
13+
project.evaluationDependsOn(":app")
2714
}
2815

2916
tasks.register("clean", Delete) {

‎android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
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-8.9-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

‎android/settings.gradle

+12-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ pluginManagement {
55
def flutterSdkPath = properties.getProperty("flutter.sdk")
66
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
77
return flutterSdkPath
8-
}
9-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
109

11-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1211

13-
plugins {
14-
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
1516
}
1617
}
1718

18-
include ":app"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.1.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
23+
}
1924

20-
apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
25+
include ":app"

‎ios/Flutter/Debug.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"

‎ios/Flutter/Release.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

0 commit comments

Comments
 (0)