mugiten/mugiten
1
0
Fork 0
Code Issues 94 Pull Requests Packages Releases 4 Activity

Update android environment

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-12-19 11:46:56 +09:00
parent 3f7d1e916d
commit 1619451191
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/build.gradle
View File

@@ -11,12 +11,12 @@ android {
ndkVersion = flutter.ndkVersion
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
jvmTarget = JavaVersion.VERSION_17
}
defaultConfig {

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

4
android/settings.gradle
View File

@@ -18,8 +18,8 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.6.0" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
id "com.android.application" version "8.13.2" apply false
id "org.jetbrains.kotlin.android" version "2.3.0" apply false
}
include ":app"

21
flake.nix
View File

@@ -17,17 +17,17 @@
allowUnfree = true;
};
};
androidSdk = (pkgs.androidenv.composeAndroidPackages {
buildToolsVersions = [ "33.0.1" "34.0.0" ];
androidPkgs = (pkgs.androidenv.composeAndroidPackages {
buildToolsVersions = [ "35.0.0" "36.1.0" ];
platformVersions = [ "35" "36" ];
abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
cmakeVersions = [ "3.22.1" ];
includeNDK = true;
ndkVersions = [ "27.0.12077973" ];
}).androidsdk;
in f system pkgs androidSdk);
});
in f system pkgs androidPkgs);
in {
devShells = forAllSystems (_: pkgs: androidSdk: {
devShells = forAllSystems (_: pkgs: androidPkgs: {
default = let
flutter' = pkgs.flutter335;
jdk' = pkgs.jdk21;
@@ -35,12 +35,17 @@
packages = [
flutter'
pkgs.sqlite-interactive
androidSdk
androidPkgs.androidsdk
jdk'
];
env = {
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
ANDROID_SDK_ROOT = "${androidPkgs.androidsdk}/libexec/android-sdk";
GRADLE_OPTS = let
buildToolsVersion = (lib.head androidPkgs.build-tools).version;
buildToolsDir = "${androidPkgs.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}";
in lib.concatStringsSep " " [
"-Dorg.gradle.project.android.aapt2FromMavenOverride=${buildToolsDir}/aapt2"
];
FLUTTER_SDK = "${flutter'}";
JAVA_HOME = "${jdk'}/lib/openjdk";
LIBSQLITE_PATH = "${pkgs.sqlite.out}/lib/libsqlite3.so";