upgrade gecko. gradle, deps
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
plugins {
|
||||
id "com.android.application"
|
||||
id "kotlin-android"
|
||||
id "org.jetbrains.kotlin.plugin.compose" version "2.3.21"
|
||||
id "org.jetbrains.kotlin.plugin.compose" version "2.4.0"
|
||||
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
|
||||
id "dev.flutter.flutter-gradle-plugin"
|
||||
}
|
||||
@@ -28,7 +27,7 @@ def weblibreGoMobileAar = file("../../../../native/go_mobile_runtime/build/webli
|
||||
|
||||
android {
|
||||
namespace = "eu.weblibre.gecko"
|
||||
compileSdk = 36
|
||||
compileSdk = 37
|
||||
ndkVersion = rootProject.ext.ndkVersion
|
||||
|
||||
compileOptions {
|
||||
@@ -36,16 +35,12 @@ android {
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = '17'
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId = "eu.weblibre.gecko"
|
||||
// https://api.flutter.dev/flutter/widgets/AndroidView-class.html
|
||||
minSdkVersion = 26
|
||||
targetSdk = 36
|
||||
targetSdk = 37
|
||||
versionCode = flutterVersionCode.toInteger()
|
||||
versionName = flutterVersionName
|
||||
}
|
||||
@@ -134,6 +129,12 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
|
||||
}
|
||||
}
|
||||
|
||||
flutter {
|
||||
source = "../.."
|
||||
}
|
||||
|
||||
@@ -1,14 +1,10 @@
|
||||
//Required by background_fetch build
|
||||
ext {
|
||||
compileSdkVersion = 36
|
||||
targetSdkVersion = 36
|
||||
compileSdkVersion = 37
|
||||
targetSdkVersion = 37
|
||||
ndkVersion = providers.gradleProperty("weblibre.ndkVersion").get()
|
||||
}
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '2.3.21'
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
@@ -22,7 +18,7 @@ allprojects {
|
||||
if (details.requested.group == 'androidx.glance' &&
|
||||
details.requested.name == 'glance-appwidget') {
|
||||
details.useVersion '1.1.1'
|
||||
details.because 'home_widget uses 1.+ and newer alpha releases require AGP 9.1 and compileSdk 37'
|
||||
details.because 'home_widget uses 1.+; keep a stable Glance version for reproducible Android builds'
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -34,7 +30,7 @@ subprojects {
|
||||
afterEvaluate {
|
||||
if (it.hasProperty("android")) {
|
||||
android {
|
||||
compileSdkVersion 36
|
||||
compileSdkVersion 37
|
||||
ndkVersion rootProject.ext.ndkVersion
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,5 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
|
||||
weblibre.ndkVersion=28.2.13676358
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
# This builtInKotlin flag was added automatically by Flutter migrator
|
||||
android.builtInKotlin=false
|
||||
# This newDsl flag was added automatically by Flutter migrator
|
||||
android.newDsl=false
|
||||
|
||||
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
|
||||
|
||||
@@ -18,8 +18,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||
id "com.android.application" version '8.13.2' apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.3.21" apply false
|
||||
id "com.android.application" version '9.2.1' apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.4.0" apply false
|
||||
}
|
||||
|
||||
include ":app"
|
||||
|
||||
Reference in New Issue
Block a user