Skip to content

Commit 20165d4

Browse files
treotreo
committed
Update android example to beta7
Signed-off-by: Paul Dubs <paul.dubs@gmail.com>
1 parent e2dbc81 commit 20165d4

File tree

3 files changed

+33
-29
lines changed

3 files changed

+33
-29
lines changed

‎android-examples/app/build.gradle‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ android {
2727
}
2828

2929
dependencies {
30+
def dl4jVersion = '1.0.0-beta7'
31+
def openblasVersion = '0.3.9-1.5.3'
32+
def opencvVersion = '4.3.0-1.5.3'
33+
def leptonicaVersion = '1.79.0-1.5.3'
34+
3035
implementation fileTree(dir: 'libs', include: ['*.jar'])
3136

3237
implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -35,34 +40,33 @@ dependencies {
3540
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3641
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3742

38-
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
43+
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: dl4jVersion) {
3944
exclude group: 'org.bytedeco', module: 'opencv-platform'
4045
exclude group: 'org.bytedeco', module: 'leptonica-platform'
4146
exclude group: 'org.bytedeco', module: 'hdf5-platform'
4247
exclude group: 'org.nd4j', module: 'nd4j-base64'
4348
}
4449

45-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
46-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
47-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
48-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86"
49-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86_64"
50-
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2'
51-
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-arm"
52-
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-arm64"
53-
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-x86"
54-
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-x86_64"
55-
implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2'
56-
implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-arm"
57-
implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-arm64"
58-
implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-x86"
59-
implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-x86_64"
60-
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.2'
61-
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.2', classifier: "android-arm"
62-
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.2', classifier: "android-arm64"
63-
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.2', classifier: "android-x86"
64-
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.2', classifier: "android-x86_64"
50+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion
51+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm"
52+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm64"
53+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86"
54+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86_64"
55+
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion
56+
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-arm"
57+
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-arm64"
58+
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-x86"
59+
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-x86_64"
60+
implementation group: 'org.bytedeco', name: 'opencv', version: opencvVersion
61+
implementation group: 'org.bytedeco', name: 'opencv', version: opencvVersion, classifier: "android-arm"
62+
implementation group: 'org.bytedeco', name: 'opencv', version: opencvVersion, classifier: "android-arm64"
63+
implementation group: 'org.bytedeco', name: 'opencv', version: opencvVersion, classifier: "android-x86"
64+
implementation group: 'org.bytedeco', name: 'opencv', version: opencvVersion, classifier: "android-x86_64"
65+
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion
66+
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion, classifier: "android-arm"
67+
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion, classifier: "android-arm64"
68+
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion, classifier: "android-x86"
69+
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion, classifier: "android-x86_64"
6570

6671
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.4'
67-
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.4'
6872
}

‎android-examples/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
4+
55
repositories {
66
google()
77
jcenter()
8-
8+
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.3'
12-
11+
classpath 'com.android.tools.build:gradle:4.0.0'
12+
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
@@ -20,7 +20,7 @@ allprojects {
2020
repositories {
2121
google()
2222
jcenter()
23-
23+
2424
}
2525
}
2626

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 07 07:06:48 JST 2020
1+
#Sun Jun 07 20:18:50 CEST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 commit comments

Comments
 (0)