Update to Java11 and split apks

michaeltroger · Sep 25, 2021 · 48a2a95 · 48a2a95
1 parent bf25c4d
commit 48a2a95
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -27,4 +27,4 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: APK
-        path: app/build/outputs/apk/debug/app-debug.apk
+        path: app/build/outputs/apk/debug/
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -38,6 +38,14 @@ jobs:
         tag_name: ${{ env.VERSION_CODE }}
         name: ${{ env.VERSION_NAME }}
         body: ${{ github.event.inputs.changelog }}
-        files: app/build/outputs/apk/debug/app-debug.apk
+        files: |
+          app/build/outputs/apk/debug/app-arm64-v8a-debug.apk
+          app/build/outputs/apk/debug/app-armeabi-debug.apk
+          app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk
+          app/build/outputs/apk/debug/app-mips64-debug.apk
+          app/build/outputs/apk/debug/app-mips-debug.apk
+          app/build/outputs/apk/debug/app-universal-debug.apk
+          app/build/outputs/apk/debug/app-x86_64-debug.apk
+          app/build/outputs/apk/debug/app-x86-debug.apk
 
 
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ Copyright of the logo: The Coca-Cola Company
 
 ### What is this repository for? ###
 * Uses the camera image to search for a specified template image within it via a feature matching approach using the OpenCV library. The detected object is marked with lines within the scene. This can be used to e.g. find a logo.
+* More computer vision projects at https://michaeltroger.com/computervision/
 
 ### How do I get set up? ###
 * IDE: Android Studio (tested with 2020.3.1)

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,15 +9,30 @@ android {
         applicationId "com.michaeltroger.featurematching"
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    splits {
+        abi {
+            enable true
+            reset()
+            include "x86", "x86_64", "mips", "mips64", "armeabi", "armeabi-v7a", "arm64-v8a"
+            universalApk true
+        }
+    }
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.30'
     ext.kotlin_version = '1.5.21'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }