Safely build 64-bit binaries along with some modernization.

muojp · muojp · commit 04ef36ebdee2 · 2018-09-26T19:48:18.000+09:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/UVCCamera.iml b/UVCCamera.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="UVCCamera" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="UVCCamera" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/build.gradle b/build.gradle
@@ -2,16 +2,18 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }
 
 allprojects {
     repositories {
-		maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' }
+		maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' }
         jcenter()
+        google()
     }
 }
 
@@ -22,7 +24,7 @@ task clean(type: Delete) {
 ext {
 	supportLibVersion = '25.3.1'  // variable that can be referenced to keep support libs consistent
 	commonLibVersion= '1.5.20'
-	versionBuildTool = '25.0.2'
+	versionBuildTool = '28.0.3'
 	versionCompiler = 25
 	versionTarget = 23
 	versionNameString = '1.0.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 15 17:08:49 JST 2017
+#Wed Sep 26 17:44:21 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle
@@ -84,9 +84,9 @@ task ndkClean(type: Exec, description: 'clean JNI libraries') {
 clean.dependsOn 'ndkClean'
 
 dependencies {
-    compile fileTree(dir: new File(buildDir, 'libs'), include: '*.jar')
-	compile "com.android.support:support-annotations:${supportLibVersion}"
-	compile("com.serenegiant:common:${commonLibVersion}") {
+    api fileTree(dir: new File(buildDir, 'libs'), include: '*.jar')
+	api "com.android.support:support-annotations:${supportLibVersion}"
+	api("com.serenegiant:common:${commonLibVersion}") {
 		exclude module: 'support-v4'
 	}
 }
diff --git a/libuvccamera/src/main/jni/Application.mk b/libuvccamera/src/main/jni/Application.mk
@@ -27,6 +27,6 @@
 #NDK_TOOLCHAIN_VERSION := 4.9
 
 APP_PLATFORM := android-14
-APP_ABI := armeabi armeabi-v7a x86 mips
+APP_ABI := all
 #APP_OPTIM := debug
 APP_OPTIM := release
diff --git a/usbCameraCommon/build.gradle b/usbCameraCommon/build.gradle
@@ -46,9 +46,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile("com.serenegiant:common:${commonLibVersion}") {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api("com.serenegiant:common:${commonLibVersion}") {
    		exclude module: 'support-v4'
    	}
-    compile project(':libuvccamera')
+    api project(':libuvccamera')
 }
diff --git a/usbCameraTest/build.gradle b/usbCameraTest/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':libuvccamera')
+    implementation project(':libuvccamera')
 }
diff --git a/usbCameraTest0/build.gradle b/usbCameraTest0/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':libuvccamera')
+    implementation project(':libuvccamera')
 }
diff --git a/usbCameraTest2/build.gradle b/usbCameraTest2/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':libuvccamera')
+    implementation project(':libuvccamera')
 }
diff --git a/usbCameraTest3/build.gradle b/usbCameraTest3/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':usbCameraCommon')
+    implementation project(':usbCameraCommon')
 }
diff --git a/usbCameraTest4/build.gradle b/usbCameraTest4/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':usbCameraCommon')
+    implementation project(':usbCameraCommon')
 }
diff --git a/usbCameraTest5/build.gradle b/usbCameraTest5/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':usbCameraCommon')
+    implementation project(':usbCameraCommon')
 }
diff --git a/usbCameraTest6/build.gradle b/usbCameraTest6/build.gradle
@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-    compile project(':usbCameraCommon')
+    implementation project(':usbCameraCommon')
 }
diff --git a/usbCameraTest7/build.gradle b/usbCameraTest7/build.gradle
@@ -51,5 +51,5 @@ android {
 }
 
 dependencies {
-    compile project(':usbCameraCommon')
+    implementation project(':usbCameraCommon')
 }
diff --git a/usbCameraTest8/build.gradle b/usbCameraTest8/build.gradle
@@ -51,11 +51,11 @@ android {
 }
 
 dependencies {
-	compile fileTree(dir: 'libs', include: ['*.jar'])
-	androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+	implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
 		exclude group: 'com.android.support', module: 'support-annotations'
 	})
-	testCompile 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.12'
 
-	compile project(':usbCameraCommon')
+	implementation project(':usbCameraCommon')
 }

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,18 @@`
`2`	`2`	`buildscript {`
`3`	`3`	`repositories {`
`4`	`4`	`jcenter()`
	`5`	`+ google()`
`5`	`6`	`}`
`6`	`7`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:2.3.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`8`	`9`	`}`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`allprojects {`
`12`	`13`	`repositories {`
`13`		`- maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' }`
	`14`	`+ maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' }`
`14`	`15`	`jcenter()`
	`16`	`+ google()`
`15`	`17`	`}`
`16`	`18`	`}`
`17`	`19`
`@@ -22,7 +24,7 @@ task clean(type: Delete) {`
`22`	`24`	`ext {`
`23`	`25`	`supportLibVersion = '25.3.1' // variable that can be referenced to keep support libs consistent`
`24`	`26`	`commonLibVersion= '1.5.20'`
`25`		`- versionBuildTool = '25.0.2'`
	`27`	`+ versionBuildTool = '28.0.3'`
`26`	`28`	`versionCompiler = 25`
`27`	`29`	`versionTarget = 23`
`28`	`30`	`versionNameString = '1.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ task ndkClean(type: Exec, description: 'clean JNI libraries') {`
`84`	`84`	`clean.dependsOn 'ndkClean'`
`85`	`85`
`86`	`86`	`dependencies {`
`87`		`- compile fileTree(dir: new File(buildDir, 'libs'), include: '*.jar')`
`88`		`- compile "com.android.support:support-annotations:${supportLibVersion}"`
`89`		`- compile("com.serenegiant:common:${commonLibVersion}") {`
	`87`	`+ api fileTree(dir: new File(buildDir, 'libs'), include: '*.jar')`
	`88`	`+ api "com.android.support:support-annotations:${supportLibVersion}"`
	`89`	`+ api("com.serenegiant:common:${commonLibVersion}") {`
`90`	`90`	`exclude module: 'support-v4'`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ android {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`dependencies {`
`49`		`- compile fileTree(dir: 'libs', include: ['*.jar'])`
`50`		`- compile("com.serenegiant:common:${commonLibVersion}") {`
	`49`	`+ api fileTree(dir: 'libs', include: ['*.jar'])`
	`50`	`+ api("com.serenegiant:common:${commonLibVersion}") {`
`51`	`51`	`exclude module: 'support-v4'`
`52`	`52`	`}`
`53`		`- compile project(':libuvccamera')`
	`53`	`+ api project(':libuvccamera')`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- compile project(':libuvccamera')`
	`52`	`+ implementation project(':libuvccamera')`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,5 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- compile project(':usbCameraCommon')`
	`54`	`+ implementation project(':usbCameraCommon')`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- compile fileTree(dir: 'libs', include: ['*.jar'])`
`55`		`- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {`
	`54`	`+ implementation fileTree(dir: 'libs', include: ['*.jar'])`
	`55`	`+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {`
`56`	`56`	`exclude group: 'com.android.support', module: 'support-annotations'`
`57`	`57`	`})`
`58`		`- testCompile 'junit:junit:4.12'`
	`58`	`+ testImplementation 'junit:junit:4.12'`
`59`	`59`
`60`		`- compile project(':usbCameraCommon')`
	`60`	`+ implementation project(':usbCameraCommon')`
`61`	`61`	`}`