Skip to content

Commit e75af70

Browse files
committed
Update flutter and disable impeller for now
1 parent fb4f8f2 commit e75af70

10 files changed

Lines changed: 119 additions & 104 deletions

File tree

android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/to/reference-keystore
Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
1+
import java.util.Properties
2+
13
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
4+
id("com.android.application")
5+
id("kotlin-android")
46
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
7+
id("dev.flutter.flutter-gradle-plugin")
68
}
79

810
// custom: load signing keys
9-
def keystoreProperties = new Properties()
10-
def keystorePropertiesFile = rootProject.file('key.properties')
11+
val keystoreProperties = Properties()
12+
val keystorePropertiesFile = rootProject.file("key.properties")
1113
if (keystorePropertiesFile.exists()) {
12-
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
14+
keystoreProperties.load(keystorePropertiesFile.inputStream())
1315
}
1416

1517
android {
1618
namespace = "com.example.synctube"
1719
compileSdk = flutter.compileSdkVersion
18-
// ndkVersion = flutter.ndkVersion
20+
ndkVersion = flutter.ndkVersion
1921
// temp fix for this error:
2022
// Your project is configured with Android NDK 23.1.7779620, but the following plugin(s) depend on a different Android NDK version:
21-
ndkVersion = "27.0.12077973"
23+
// ndkVersion = "27.0.12077973"
2224

2325
compileOptions {
24-
coreLibraryDesugaringEnabled true
26+
isCoreLibraryDesugaringEnabled = true
2527
sourceCompatibility = JavaVersion.VERSION_17
2628
targetCompatibility = JavaVersion.VERSION_17
2729
}
2830

29-
dependencies {
30-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
31-
}
32-
3331
kotlinOptions {
34-
jvmTarget = JavaVersion.VERSION_17
32+
jvmTarget = JavaVersion.VERSION_17.toString()
3533
}
3634

3735
defaultConfig {
@@ -40,34 +38,48 @@ android {
4038
// You can update the following values to match your application needs.
4139
// For more information, see: https://flutter.dev/to/review-gradle-config.
4240
// minSdk = flutter.minSdkVersion
43-
minSdk = 21
41+
minSdk = flutter.minSdkVersion
4442
targetSdk = flutter.targetSdkVersion
4543
versionCode = flutter.versionCode
4644
versionName = flutter.versionName
4745
}
4846

4947
// custom: config
5048
signingConfigs {
51-
release {
52-
keyAlias keystoreProperties['keyAlias']
53-
keyPassword keystoreProperties['keyPassword']
54-
storeFile keystorePropertiesFile.exists() ? file(keystoreProperties['storeFile']) : null
55-
storePassword keystoreProperties['storePassword']
49+
create("release") {
50+
keyAlias = keystoreProperties["keyAlias"] as String?
51+
keyPassword = keystoreProperties["keyPassword"] as String?
52+
storeFile = if (keystorePropertiesFile.exists()) {
53+
file(keystoreProperties["storeFile"] as String)
54+
} else null
55+
storePassword = keystoreProperties["storePassword"] as String?
5656
}
5757
}
5858

5959
buildTypes {
6060
debug {
61-
signingConfig = keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
61+
signingConfig = if (keystorePropertiesFile.exists()) {
62+
signingConfigs.getByName("release")
63+
} else {
64+
signingConfigs.getByName("debug")
65+
}
6266
}
6367
release {
6468
// TODO: Add your own signing config for the release build.
6569
// Signing with the debug keys for now, so `flutter run --release` works.
66-
signingConfig = keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
70+
signingConfig = if (keystorePropertiesFile.exists()) {
71+
signingConfigs.getByName("release")
72+
} else {
73+
signingConfigs.getByName("debug")
74+
}
6775
}
6876
}
6977
}
7078

79+
dependencies {
80+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
81+
}
82+
7183
flutter {
7284
source = "../.."
7385
}

android/app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
while the Flutter UI initializes. After that, this theme continues
2222
to determine the Window background behind the Flutter UI. -->
2323
<meta-data
24-
android:name="io.flutter.embedding.android.NormalTheme"
25-
android:resource="@style/NormalTheme"
26-
/>
24+
android:name="io.flutter.embedding.android.NormalTheme"
25+
android:resource="@style/NormalTheme"
26+
/>
2727
<intent-filter>
2828
<action android:name="android.intent.action.MAIN"/>
2929
<category android:name="android.intent.category.LAUNCHER"/>
@@ -44,6 +44,11 @@
4444
<meta-data
4545
android:name="flutterEmbedding"
4646
android:value="2" />
47+
<!-- todo remove when video_player will be fixed -->
48+
<meta-data
49+
android:name="io.flutter.embedding.android.EnableImpeller"
50+
android:value="false"
51+
/>
4752
<!-- custom: for ota update -->
4853
<provider
4954
android:name="sk.fourq.otaupdate.OtaUpdateFileProvider"

android/build.gradle

Lines changed: 0 additions & 24 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=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
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: 1 addition & 1 deletion
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.12-all.zip

android/settings.gradle

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

android/settings.gradle.kts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
pluginManagement {
2+
val flutterSdkPath = run {
3+
val properties = java.util.Properties()
4+
file("local.properties").inputStream().use { properties.load(it) }
5+
val flutterSdkPath = properties.getProperty("flutter.sdk")
6+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
7+
flutterSdkPath
8+
}
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
23+
}
24+
25+
include(":app")

0 commit comments

Comments
 (0)