mirror of
https://github.com/dz0ny/meshcore-sar.git
synced 2026-08-11 16:30:28 +00:00
chore: bump app version and update Android/iOS build tooling
- Bump version to 2026.0613.2+57 - Gradle wrapper 8.12 -> 8.14; Flutter migrator flags (builtInKotlin/newDsl) and relax kotlin.jvm.target.validation to warning for third-party plugins - Refresh iOS Xcode project, scheme, Info.plist, Podfile.lock and SwiftPM Package.resolved Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -16,6 +16,24 @@ subprojects {
|
||||
project.layout.buildDirectory.value(newSubprojectBuildDir)
|
||||
}
|
||||
subprojects {
|
||||
// flutter_avif_android 3.1.0 (latest) ships duplicate Java and Kotlin
|
||||
// copies of FlutterAvifPlugin. Kotlin 2.2+ rejects the redeclaration. The
|
||||
// plugin's Java source dir contains only this redundant copy, so empty it
|
||||
// and let the identical Kotlin implementation compile. kotlinc reads the
|
||||
// module's Java source roots for joint compilation, so clearing srcDirs
|
||||
// (rather than an exclude filter, which AGP doesn't forward to kotlinc) is
|
||||
// what actually removes the duplicate from its view. Registered before
|
||||
// evaluationDependsOn so it also covers :app, which that call evaluates
|
||||
// eagerly.
|
||||
afterEvaluate {
|
||||
if (project.name == "flutter_avif_android") {
|
||||
extensions.findByName("android")?.let { ext ->
|
||||
(ext as com.android.build.gradle.BaseExtension)
|
||||
.sourceSets.getByName("main").java
|
||||
.setSrcDirs(emptyList<String>())
|
||||
}
|
||||
}
|
||||
}
|
||||
project.evaluationDependsOn(":app")
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
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
|
||||
# Kotlin 2.2+ fails the build when a module's Java and Kotlin compile tasks
|
||||
# target different JVM versions. Several Flutter plugins still pin mismatched
|
||||
# targets (e.g. Java 1.8 vs Kotlin 1.8, or Java 11 vs Kotlin 17). On Android
|
||||
# every class is dexed by D8/R8, so the class-file version mismatch is benign;
|
||||
# downgrade the strict check to a warning so third-party plugins build.
|
||||
kotlin.jvm.target.validation.mode=warning
|
||||
|
||||
@@ -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.12-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
|
||||
|
||||
@@ -19,8 +19,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
|
||||
id("com.android.application") version "8.9.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
|
||||
id("com.android.application") version "8.11.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
||||
}
|
||||
|
||||
include(":app")
|
||||
|
||||
Reference in New Issue
Block a user