Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2025-08-03 20:24:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into 'main'

Browse source 
removed hotfix, as this has been integrated into cargo-ndk already

See merge request veilid/veilid!269
This commit is contained in:
Christien Rioux 2024-04-20 15:14:33 +00:00
commit a0de48771e
11 changed files with 122 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
veilid-flutter/android/build.gradle
View file

@ -63,7 +63,7 @@ android {
}
}
ndkVersion '25.1.8937393'
ndkVersion '26.3.11579264'
// Required to copy libc++_shared.so
externalNativeBuild {
@ -99,4 +99,4 @@ afterEvaluate {
def buildType = "${variant.buildType.name.capitalize()}"
tasks["generate${productFlavor}${buildType}Assets"].dependsOn(tasks["cargoBuild"])
}
}
}

4
veilid-flutter/example/android/app/build.gradle
View file

@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion flutter.compileSdkVersion
ndkVersion '25.1.8937393'
ndkVersion '26.3.11579264'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@ -71,4 +71,4 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
}