Update/fix UVCCamera to support minSdkVersion=30 targetSdkVersion=34

.github/workflows/main.yml

@@ -0,0 +1,40 @@
+name: Run Gradle Build on PRs
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 11
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        gradle-version: 7.4.2
+
+    - uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r21e
+
+    - name: Execute Gradle Build Release
+      run: ./gradlew clean build assembleRelease --parallel -x lint
+
+    - name: Upload
+      if: github.ref_name == 'release'
+      uses: actions/upload-artifact@v4
+      with:
+        name: Build Artifacts (${{ matrix.os }})
+        path: app/build/outputs/apk/release/

.gitignore

@@ -24,6 +24,7 @@ bin/classes
 bin/res
 bin/jarlist.cache
 *.cache
+.DS_Store
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -55,6 +56,8 @@ build
 !.idea/fileColors.xml
 !.idea/encodings.xml
 !.idea/gradle.xml
+!.idea/modules.xml
+!.idea/modules/*.xml
 !.idea/runConfigurations/*.xml
 
 !.idea/inspectionProfiles/*.xml

README.md

@@ -44,7 +44,7 @@ If you want to use Android Studio(unfortunately NDK supporting on Android Studio
 5. Android Studio raise some errors but just ignore now. Android Studio generate `local.properties` file. Please open `local.properties` and add `ndk.dir` key to the end of the file. The contents of the file looks like this.
 ```
 sdk.dir={path to Android SDK on your storage}
-ndk.dir={path to Android SDK on your storage}
+ndk.dir={path to Android NDK on your storage}
 ```
 Please replace actual path to SDK and NDK on your storage.  
 Of course you can make `local.properties` by manually instead of using automatically generated ones by Android Studio.

UVCCamera.iml

@@ -1,19 +1,12 @@
 <?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" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+<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">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

build.gradle

@@ -1,22 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    repositories {
-//		google()
-		maven { url 'https://maven.google.com' }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-    }
+	repositories {
+		jcenter()
+		google()
+	}
+	dependencies {
+		classpath 'com.android.tools.build:gradle:7.2.1'
+	}
 }
 
 allprojects {
-    repositories {
-//    	google()
-		maven { url 'https://maven.google.com' }
+	repositories {
+		maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' }
 		jcenter()
-		maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' }
-    }
+		google()
+	}
 }
 
 task clean(type: Delete) {
@@ -26,9 +24,9 @@ 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
+	versionCompiler = 34
+	versionTarget = 34
+	minTargetVersion = 30
 	versionNameString = '1.0.0'
 	javaSourceCompatibility = JavaVersion.VERSION_1_8
 	javaTargetCompatibility = JavaVersion.VERSION_1_8

gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Oct 02 16:16:11 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

libuvccamera/build.gradle

@@ -25,16 +25,15 @@ apply plugin: 'com.android.library'
 import org.apache.tools.ant.taskdefs.condition.Os
 
 android {
-	compileSdkVersion versionCompiler
-	buildToolsVersion versionBuildTool
+	compileSdk versionCompiler
 
 	compileOptions {
 		sourceCompatibility javaSourceCompatibility
 		targetCompatibility javaTargetCompatibility
 	}
 
     defaultConfig {
-        minSdkVersion 14
+		minSdkVersion minTargetVersion
 		targetSdkVersion versionTarget
     }
 
@@ -58,13 +57,16 @@ tasks.withType(JavaCompile) {
 
 String getNdkBuildPath() {
 	Properties properties = new Properties()
-	properties.load(project.rootProject.file('local.properties').newDataInputStream())
-	def ndkBuildingDir = properties.getProperty("ndk.dir")
-	def ndkBuildPath = ndkBuildingDir
+	def ndkBuildPath = "";
+	def ndkBuildingDir = "";
+	if (project.rootProject.file("local.properties").exists()) {
+		properties.load(project.rootProject.file('local.properties').newDataInputStream())
+		ndkBuildingDir = properties.getProperty("ndk.dir") + '/'
+	}
 	if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-		ndkBuildPath = ndkBuildingDir + '/ndk-build.cmd'
+		ndkBuildPath = ndkBuildingDir + 'ndk-build.cmd'
 	} else {
-		ndkBuildPath = ndkBuildingDir + '/ndk-build'
+		ndkBuildPath = ndkBuildingDir + 'ndk-build'
 	}
 	return ndkBuildPath
 }
@@ -86,7 +88,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}") {

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>