Upgrade libraries and clean up build system

1 files changed, 15 insertions, 58 deletions

diff --git a/akono/build.gradle.kts b/akono/build.gradle.kts
index 8b094f96..889ee799 100644
--- a/akono/build.gradle.kts
+++ b/akono/build.gradle.kts
@@ -1,85 +1,42 @@
-
 plugins {
     id("com.android.library")
     kotlin("android")
-    kotlin("android.extensions")
 }
 
 android {
-    compileSdkVersion(29)
+    compileSdk = 31
     defaultConfig {
-        minSdkVersion(21)
-        targetSdkVersion(29)
-
-        versionCode = 1
-        versionName = "1.0"
+        minSdk = 21
+        targetSdk = 31
 
+        testApplicationId = "net.taler.akono.test"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        // Specifies the application ID for the test APK.
-        testApplicationId = "akono.test"
+        testInstrumentationRunnerArguments += mapOf(
+            "disableAnalytics" to "true"
+        )
 
         ndk {
-            // Tells Gradle to build outputs for the following ABIs and package
-            // them into your APK.
-            abiFilters("armeabi-v7a")
-            // FIXME: uncomment this arch after being able to build it 
-   //         abiFilters("arm64-v8a")
-   //         abiFilters("x86")
-   //         abiFilters("x86_64")
+            abiFilters.add("armeabi-v7a")
+            abiFilters.add("arm64-v8a")
+            abiFilters.add("x86")
+            abiFilters.add("x86_64")
         }
-
         externalNativeBuild {
             cmake.arguments("-DANDROID_STL=c++_shared")
         }
 
         consumerProguardFiles("proguard-rules.pro")
     }
-    useLibrary("android.test.runner")
-    useLibrary("android.test.base")
-    useLibrary("android.test.mock")
 
     externalNativeBuild {
         cmake {
-            setPath(file("src/main/cpp/CMakeLists.txt"))
-        }
-    }
-
-    sourceSets {
-        named("main") {
-            jniLibs.srcDirs("../deps/compiled")
+            path = (file("src/main/cpp/CMakeLists.txt"))
         }
     }
 }
 
-val kotlin_version: String by rootProject.extra
-
-repositories {
-    jcenter()
-}
-
 dependencies {
-    //implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20")
-    //implementation(kotlin("stdlib"))
-
-    // Use the Kotlin test library.
-    testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
-
-    // Use the Kotlin JUnit integration.
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
-
-    androidTestImplementation("androidx.test:core:1.2.0")
-    androidTestImplementation("androidx.test:runner:1.2.0")
-    androidTestImplementation("androidx.test:rules:1.2.0")
-
-    // Assertions
-    androidTestImplementation("androidx.test.ext:junit:1.1.1")
-    androidTestImplementation("androidx.test.ext:truth:1.2.0")
-    androidTestImplementation("com.google.truth:truth:0.44")
-
-    // Use the Kotlin test library.
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
-
-    // Use the Kotlin JUnit integration.
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
-    implementation(kotlin("stdlib-jdk7", kotlin_version))
+    androidTestImplementation("androidx.test:runner:1.4.0")
+    androidTestImplementation("androidx.test:rules:1.4.0")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
 }