Switching to androidX and latest Gradle

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 
@@ -24,11 +24,11 @@ task clean(type: Delete) {
 }
 
 ext {
-	supportLibVersion = '27.1.1'  // variable that can be referenced to keep support libs consistent
-	commonLibVersion= '2.12.4'
-	versionBuildTool = '27.0.3'
-	versionCompiler = 27
-	versionTarget = 27
+	androidXVersion = '1.1.0'
+	commonLibVersion= '4.1.1'
+	versionBuildTool = '29.0.2'
+	versionCompiler = 29
+	versionTarget = 28
 	versionNameString = '1.0.0'
 	javaSourceCompatibility = JavaVersion.VERSION_1_8
 	javaTargetCompatibility = JavaVersion.VERSION_1_8

gradle/wrapper/gradle-wrapper.properties

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

libuvccamera/build.gradle

@@ -34,7 +34,7 @@ android {
 	}
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 18
 		targetSdkVersion versionTarget
     }
 
@@ -86,10 +86,6 @@ clean.dependsOn 'ndkClean'
 dependencies {
     implementation fileTree(dir: new File(buildDir, 'libs'), include: '*.jar')
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
-
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 }

libuvccamera/src/main/AndroidManifest.xml

@@ -26,8 +26,4 @@
     android:versionCode="2"
     android:versionName="1.1" >
 
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
-
 </manifest>

libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java

@@ -29,12 +29,13 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.serenegiant.dialog.MessageDialogFragmentV4;
 import com.serenegiant.utils.BuildCheck;
 import com.serenegiant.utils.HandlerThreadHandler;
@@ -214,7 +215,7 @@ public void run() {
 	 */
 	@SuppressLint("NewApi")
 	@Override
-	public void onMessageDialogResult(final MessageDialogFragmentV4 dialog, final int requestCode, final String[] permissions, final boolean result) {
+	public void onMessageDialogResult(@NonNull MessageDialogFragmentV4 dialog, final int requestCode, @NonNull String[] permissions, final boolean result) {
 		if (result) {
 			// メッセージダイアログでOKを押された時はパーミッション要求する
 			if (BuildCheck.isMarshmallow()) {

libuvccamera/src/main/java/com/serenegiant/common/BaseFragment.java

@@ -30,11 +30,12 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
 import com.serenegiant.dialog.MessageDialogFragment;
 import com.serenegiant.utils.BuildCheck;
 import com.serenegiant.utils.HandlerThreadHandler;

libuvccamera/src/main/java/com/serenegiant/usb/CameraDialog.java

@@ -43,9 +43,6 @@
 import android.widget.CheckedTextView;
 import android.widget.Spinner;
 
-import com.serenegiant.usb.DeviceFilter;
-import com.serenegiant.usb.USBMonitor;
-
 import com.serenegiant.uvccamera.R;
 
 public class CameraDialog extends DialogFragment {
@@ -87,7 +84,6 @@ public CameraDialog(/* no arguments */) {
 		// Fragment need default constructor
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void onAttach(final Activity activity) {
 		super.onAttach(activity);
@@ -148,7 +144,7 @@ private final View initView() {
 	public void onResume() {
 		super.onResume();
 		updateDevices();
-	    final Button button = (Button)getDialog().findViewById(android.R.id.button3);
+	    final Button button = getDialog().findViewById(android.R.id.button3);
 	    if (button != null) {
 	    	button.setOnClickListener(mOnClickListener);
 	    }

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 := arm64-v8a armeabi-v7a x86_64 x86
 #APP_OPTIM := debug
 APP_OPTIM := release

usbCameraCommon/build.gradle

@@ -48,11 +48,8 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-   		exclude module: 'support-v4'
-   	}
 	implementation project(':libuvccamera')
 }

usbCameraCommon/src/main/java/com/serenegiant/usbcameracommon/UVCCameraHandlerMultiSurface.java

@@ -30,6 +30,8 @@
 import com.serenegiant.usb.UVCCamera;
 import com.serenegiant.widget.CameraViewInterface;
 
+import java.io.FileNotFoundException;
+
 public class UVCCameraHandlerMultiSurface extends AbstractUVCCameraHandler {
 	/**
 	 * create UVCCameraHandlerMultiSurface, use MediaVideoEncoder, try MJPEG, default bandwidth
@@ -170,7 +172,11 @@ public void captureStill(final String path) {
 			public void run() {
 				synchronized (UVCCameraHandlerMultiSurface.this) {
 					if (mRendererHolder != null) {
-						mRendererHolder.captureStill(path);
+						try {
+							mRendererHolder.captureStill(path);
+						} catch (FileNotFoundException e) {
+							e.printStackTrace();
+						}
 						updateMedia(path);
 					}
 				}

usbCameraTest/build.gradle

@@ -34,7 +34,7 @@ android {
 
     defaultConfig {
         applicationId "com.serenegiant.usbcameratest"
-        minSdkVersion 14
+        minSdkVersion 18
 		targetSdkVersion versionTarget
 		versionCode 8
 		versionName "3.00"
@@ -51,11 +51,8 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 }

usbCameraTest/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest.MainActivity"
             android:label="@string/app_name" >

usbCameraTest0/build.gradle

@@ -34,7 +34,7 @@ android {
 
     defaultConfig {
         applicationId "com.serenegiant.usbcameratest0"
-        minSdkVersion 14
+        minSdkVersion 18
 		targetSdkVersion versionTarget
 		versionCode 8
 		versionName "3.00"
@@ -51,11 +51,8 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 }

usbCameraTest0/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest0.MainActivity"
             android:label="@string/app_name" >

usbCameraTest2/build.gradle

@@ -51,11 +51,8 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 }

usbCameraTest2/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest2.MainActivity"
             android:label="@string/app_name" >

usbCameraTest3/build.gradle

@@ -51,12 +51,9 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 	implementation project(':usbCameraCommon')
 }

usbCameraTest3/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest3.MainActivity"
             android:screenOrientation="sensorLandscape"

usbCameraTest4/build.gradle

@@ -51,12 +51,9 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 	implementation project(':usbCameraCommon')
 }

usbCameraTest4/src/main/AndroidManifest.xml

@@ -35,7 +35,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"

usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java

@@ -23,6 +23,7 @@
 
 package com.serenegiant.service;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
@@ -202,8 +203,12 @@ public void stopRecording() {
 
 	public void captureStill(final String path) {
 		if (mRendererHolder != null) {
-			mRendererHolder.captureStill(path);
-			sendMessage(obtainMessage(MSG_CAPTURE_STILL, path));
+			try {
+				mRendererHolder.captureStill(path);
+				sendMessage(obtainMessage(MSG_CAPTURE_STILL, path));
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			}
 		}
 	}
 

usbCameraTest5/build.gradle

@@ -51,12 +51,9 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 	implementation project(':usbCameraCommon')
 }

usbCameraTest5/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest5.MainActivity"
             android:label="@string/app_name" >

usbCameraTest6/build.gradle

@@ -51,12 +51,9 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 	implementation project(':usbCameraCommon')
 }

usbCameraTest6/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="com.serenegiant.usbcameratest6.MainActivity"
             android:label="@string/app_name"

usbCameraTest7/build.gradle

@@ -53,12 +53,9 @@ android {
 dependencies {
 	api fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "com.android.support:support-v4:${supportLibVersion}"
-	implementation "com.android.support:support-annotations:${supportLibVersion}"
+	implementation "androidx.appcompat:appcompat:${androidXVersion}"
+	implementation "com.serenegiant:common:${commonLibVersion}"
 
-	implementation("com.serenegiant:common:${commonLibVersion}") {
-		exclude module: 'support-v4'
-	}
 	implementation project(':libuvccamera')
 	implementation project(':usbCameraCommon')
 }