Skip to content

Commit f01ad35

Browse files
yptheangelsaudet
yptheangel
authored and
saudet
committed
Update project and app gradle files for android (#917)
* project gradle: update gradle version from 3.0.1 to 3.4.2 app gradle: change "compile" to "implementation" as "compile" is deprecated Signed-off-by: yptheangel <choowilson93@gmail.com> * project gradle: update gradle version 3.0.1 to 3.4.2 app gradle: remove findbugs because conflict in guava-1.0.0beta5,added compileOptions to compile app Mainactivity.java: remove deprecated backprop(true) as backprop is enabled by default Signed-off-by: yptheangel <choowilson93@gmail.com>
1 parent ec9ab1b commit f01ad35

5 files changed

Lines changed: 49 additions & 52 deletions

File tree

‎android/DL4JImageRecognitionDemo/app/build.gradle‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,33 @@ android {
6464
implementation 'com.android.support:appcompat-v7:27.1.0'
6565
implementation 'com.android.support:design:27.1.0'
6666

67-
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
67+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
6868
exclude group: 'org.bytedeco', module: 'opencv-platform'
6969
exclude group: 'org.bytedeco', module: 'leptonica-platform'
7070
exclude group: 'org.bytedeco', module: 'hdf5-platform'
7171
exclude group: 'org.nd4j', module: 'nd4j-base64'
7272
}
7373

74-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
75-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
76-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
77-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
78-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
79-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
80-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
81-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
82-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86"
83-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64"
84-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5'
85-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm"
86-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64"
87-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86"
88-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64"
89-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5'
90-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm"
91-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64"
92-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86"
93-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64"
74+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
75+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
76+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
77+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
78+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
79+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
80+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
81+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
82+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86"
83+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64"
84+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5'
85+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm"
86+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64"
87+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86"
88+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64"
89+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5'
90+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm"
91+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64"
92+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86"
93+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64"
9494

9595
implementation 'com.google.code.gson:gson:2.8.2'
9696
annotationProcessor 'org.projectlombok:lombok:1.16.16'
@@ -102,7 +102,7 @@ android {
102102
}
103103

104104

105-
compile 'com.google.code.findbugs:annotations:3.0.1', {
105+
implementation 'com.google.code.findbugs:annotations:3.0.1', {
106106
exclude module: 'jsr305'
107107
exclude module: 'jcip-annotations'
108108
}

‎android/DL4JImageRecognitionDemo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323
jcenter()
2424
}
2525
dependencies {
26-
classpath 'com.android.tools.build:gradle:3.0.1'
26+
classpath 'com.android.tools.build:gradle:3.4.2'
2727

2828

2929
// NOTE: Do not place your application dependencies here; they belong

‎android/DL4JIrisClassifierDemo/app/build.gradle‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -66,45 +66,44 @@ android {
6666
implementation 'com.android.support:design:27.1.0'
6767

6868

69-
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
69+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
7070
exclude group: 'org.bytedeco', module: 'opencv-platform'
7171
exclude group: 'org.bytedeco', module: 'leptonica-platform'
7272
exclude group: 'org.bytedeco', module: 'hdf5-platform'
7373
exclude group: 'org.nd4j', module: 'nd4j-base64'
7474
}
75-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
76-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
77-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
78-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
79-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
80-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
81-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
82-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
83-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86"
84-
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64"
85-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5'
86-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm"
87-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64"
88-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86"
89-
compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64"
90-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5'
91-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm"
92-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64"
93-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86"
94-
compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64"
75+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
76+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
77+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
78+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
79+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
80+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
81+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
82+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
83+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86"
84+
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64"
85+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5'
86+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm"
87+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64"
88+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86"
89+
implementation group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64"
90+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5'
91+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm"
92+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64"
93+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86"
94+
implementation group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64"
9595

9696
implementation 'com.google.code.gson:gson:2.8.2'
9797
annotationProcessor 'org.projectlombok:lombok:1.16.16'
9898

99-
implementation 'com.google.code.findbugs:annotations:3.0.1', {
100-
exclude module: 'jsr305'
101-
exclude module: 'jcip-annotations'
102-
}
10399

104100
//This corrects for a junit version conflict.
105101
configurations.all {
106102
resolutionStrategy.force 'junit:junit:4.12'
107-
103+
}
104+
compileOptions {
105+
sourceCompatibility JavaVersion.VERSION_1_8
106+
targetCompatibility JavaVersion.VERSION_1_8
108107
}
109108

110109
}}

‎android/DL4JIrisClassifierDemo/app/src/main/java/org/deeplearning4j/examples/iris_classifier/MainActivity.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ protected String doInBackground(Double... params) {
180180
listBuilder.layer(1, hiddenLayer);
181181
listBuilder.layer(2, outputLayer);
182182

183-
listBuilder.backprop(true);
184-
185183
MultiLayerNetwork myNetwork = new MultiLayerNetwork(listBuilder.build());
186184
myNetwork.init();
187185

‎android/DL4JIrisClassifierDemo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030

3131
}
3232
dependencies {
33-
classpath 'com.android.tools.build:gradle:3.0.1'
33+
classpath 'com.android.tools.build:gradle:3.4.2'
3434

3535
// NOTE: Do not place your application dependencies here; they belong
3636
// in the individual module build.gradle files

0 commit comments

Comments
 (0)