Update android example

Author: agibsonccc

android-examples/README.md

@@ -6,7 +6,7 @@ The neural networks shown in this example are the same as are used in the [Moon]
 
 The build configuration for Android can be found in [app/build.gradle](./app/build.gradle).
 
-[Go back](../README.md) to the main repository page to explore other features/functionality of the **Eclipse Deeplearning4J** ecosystem. File an issue [here](https://github.com/eclipse/deeplearning4j-examples/issues) to request new features.
+[Go back](../README.md) to the main repository page to explore other features/functionality of the **Eclipse Deeplearning4J** ecosystem. File an issue [here](https://github.com/eclipse/deeplearning4j/issues) to request new features.
 
 
 ```

android-examples/app/build.gradle

@@ -22,13 +22,17 @@ information regarding copyright ownership.
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
-
+    packagingOptions {
+        exclude 'META-INF/native-image/**/**.json'
+        exclude 'META-INF/native-image/*.json'
+        pickFirst 'nd4j-native.properties'
+    }
     defaultConfig {
+        compileSdkVersion 30
+
         applicationId "com.example.androidDl4jClassifier"
-        minSdkVersion 29
-        targetSdkVersion 29
+        minSdkVersion 30
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -47,11 +51,27 @@ android {
     }
 }
 
+configurations {
+    javacpp
+}
+
+task javacppExtract(type: Copy) {
+    dependsOn configurations.javacpp
+
+    from { configurations.javacpp.collect { zipTree(it) } }
+    include "lib/**"
+    into "$buildDir/javacpp/"
+    android.sourceSets.main.jniLibs.srcDirs += ["$buildDir/javacpp/lib/"]
+
+    tasks.getByName('preBuild').dependsOn javacppExtract
+}
+
+
 dependencies {
     def dl4jVersion = '1.0.0-M2'
-    def openblasVersion = '0.3.10-1.5.5'
-    def opencvVersion = '4.5.1-1.5.5'
-    def leptonicaVersion = '1.80.0-1.5.5'
+    def openblasVersion = '0.3.19-1.5.7'
+    def opencvVersion = '4.5.5-1.5.7'
+    def leptonicaVersion = '1.82.0-1.5.7'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 

android-examples/app/src/main/AndroidManifest.xml

@@ -25,13 +25,14 @@ information regarding copyright ownership.
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher"0
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:extractNativeLibs="true"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
         android:fullBackupContent="@xml/backup_descriptor">
-        <activity android:name="com.example.org.deeplearning4j.examples.androidclassifier.MainActivity">
+        <activity android:name="org.deeplearning4j.examples.androidclassifier.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

android-examples/build.gradle

@@ -29,7 +29,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -42,7 +42,7 @@ allprojects {
         google()
         jcenter()
         mavenLocal()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" }
     }
 }
 

android-examples/gradle.properties

@@ -27,7 +27,7 @@ information regarding copyright ownership.
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2g
+org.gradle.jvmargs=-Xmx4g
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

android-examples/gradle/wrapper/gradle-wrapper.properties

@@ -24,4 +24,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip