Skip to content

Commit

Permalink
Merge pull request #356 from debanjanbasu/main
Browse files Browse the repository at this point in the history
Fix - sdkVersion 16 - default can be overriden
  • Loading branch information
temeddix committed Jun 8, 2024
2 parents b1ee067 + 608665a commit 0a8373b
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/example_app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: "11"
java-version: "17"

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: "11"
java-version: "17"

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/user_app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: "11"
java-version: "17"

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
69 changes: 37 additions & 32 deletions flutter_ffi_plugin/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,64 +1,69 @@
// The Android Gradle Plugin builds the native code with the Android NDK.

group 'com.cunarist.rinf'
version '1.0'
group = "com.cunarist.rinf"
version = "1.0-SNAPSHOT"

buildscript {
ext.kotlin_version = "1.7.10"
repositories {
google()
mavenCentral()
}

dependencies {
// The Android Gradle Plugin knows how to build native code with the NDK.
classpath 'com.android.tools.build:gradle:7.3.0'
classpath("com.android.tools.build:gradle:7.3.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}

rootProject.allprojects {
allprojects {
repositories {
google()
mavenCentral()
}
}

apply plugin: 'com.android.library'
apply plugin: "com.android.library"
apply plugin: "kotlin-android"

android {
if (project.android.hasProperty("namespace")) {
namespace 'com.cunarist.rinf'
namespace = "com.cunarist.rinf"
}

// Bumping the plugin compileSdkVersion requires all clients of this plugin
// to bump the version in their app.
compileSdkVersion 31

// Simply use the `android.ndkVersion`
// declared in the `./android/app/build.gradle` file of the Flutter project.
ndkVersion android.ndkVersion
compileSdk = 34

// Invoke the shared CMake build with the Android Gradle Plugin.
externalNativeBuild {
cmake {
path "../src/CMakeLists.txt"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

// The default CMake version for the Android Gradle Plugin is 3.10.2.
// https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
//
// The Flutter tooling requires that developers have CMake 3.10 or later
// installed. You should not increase this version, as doing so will cause
// the plugin to fail to compile for some customers of the plugin.
// version "3.10.2"
}
kotlinOptions {
jvmTarget = "1.8"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceSets {
main.java.srcDirs += "src/main/kotlin"
test.java.srcDirs += "src/test/kotlin"
}

defaultConfig {
minSdkVersion 16
minSdk = 21
}

dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.mockito:mockito-core:5.0.0")
}

testOptions {
unitTests.all {
useJUnitPlatform()

testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError"
outputs.upToDateWhen {false}
showStandardStreams = true
}
}
}
}

Expand Down

0 comments on commit 0a8373b

Please sign in to comment.