diff --git a/app/build.gradle b/app/build.gradle index a06d643..2ad4f8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } packagingOptions { resources { diff --git a/dependencies.gradle b/dependencies.gradle index b12cb55..e91ee26 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ ext.versions = [ minSdk: 16, compileSdk: 33, buildTools: "29.0.3", - publishVersion: "0.9.53", + publishVersion: "0.9.54", publishVersionCode: 1 ] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..4853f37 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Apr 08 09:19:57 CDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/phenolib/build.gradle b/phenolib/build.gradle index 607c40c..dfa923d 100644 --- a/phenolib/build.gradle +++ b/phenolib/build.gradle @@ -32,12 +32,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' freeCompilerArgs += [ '-Xjvm-default=enable' ] @@ -121,10 +121,10 @@ ext { mLibraryDescription = "A library for PhenoApps" } -task sourceJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier "sources" -} +//task sourceJar(type: Jar) { +// from android.sourceSets.main.java.srcDirs +// classifier "sources" +//} afterEvaluate { publishing { diff --git a/phenolib/libs/arm64-v8a/libUVCCamera.so b/phenolib/libs/arm64-v8a/libUVCCamera.so index 67a7360..01027f8 100644 Binary files a/phenolib/libs/arm64-v8a/libUVCCamera.so and b/phenolib/libs/arm64-v8a/libUVCCamera.so differ diff --git a/phenolib/libs/arm64-v8a/libjpeg-turbo1500.so b/phenolib/libs/arm64-v8a/libjpeg-turbo1500.so deleted file mode 100644 index 6f074ce..0000000 Binary files a/phenolib/libs/arm64-v8a/libjpeg-turbo1500.so and /dev/null differ diff --git a/phenolib/libs/arm64-v8a/libjpeg-turbo212.so b/phenolib/libs/arm64-v8a/libjpeg-turbo212.so new file mode 100644 index 0000000..465b0f3 Binary files /dev/null and b/phenolib/libs/arm64-v8a/libjpeg-turbo212.so differ diff --git a/phenolib/libs/arm64-v8a/libusb1.0.so b/phenolib/libs/arm64-v8a/libusb1.0.so new file mode 100644 index 0000000..772028b Binary files /dev/null and b/phenolib/libs/arm64-v8a/libusb1.0.so differ diff --git a/phenolib/libs/arm64-v8a/libusb100.so b/phenolib/libs/arm64-v8a/libusb100.so deleted file mode 100644 index 642e73d..0000000 Binary files a/phenolib/libs/arm64-v8a/libusb100.so and /dev/null differ diff --git a/phenolib/libs/arm64-v8a/libuvc.so b/phenolib/libs/arm64-v8a/libuvc.so index e136619..76bef01 100644 Binary files a/phenolib/libs/arm64-v8a/libuvc.so and b/phenolib/libs/arm64-v8a/libuvc.so differ diff --git a/phenolib/libs/arm64-v8a/libyuv.so b/phenolib/libs/arm64-v8a/libyuv.so new file mode 100644 index 0000000..af6b8d0 Binary files /dev/null and b/phenolib/libs/arm64-v8a/libyuv.so differ diff --git a/phenolib/libs/armeabi-v7a/libUVCCamera.so b/phenolib/libs/armeabi-v7a/libUVCCamera.so index 67e5edb..b5ced1a 100644 Binary files a/phenolib/libs/armeabi-v7a/libUVCCamera.so and b/phenolib/libs/armeabi-v7a/libUVCCamera.so differ diff --git a/phenolib/libs/armeabi-v7a/libjpeg-turbo1500.so b/phenolib/libs/armeabi-v7a/libjpeg-turbo1500.so deleted file mode 100644 index 9a30bbd..0000000 Binary files a/phenolib/libs/armeabi-v7a/libjpeg-turbo1500.so and /dev/null differ diff --git a/phenolib/libs/armeabi-v7a/libjpeg-turbo212.so b/phenolib/libs/armeabi-v7a/libjpeg-turbo212.so new file mode 100644 index 0000000..d21b107 Binary files /dev/null and b/phenolib/libs/armeabi-v7a/libjpeg-turbo212.so differ diff --git a/phenolib/libs/armeabi-v7a/libusb1.0.so b/phenolib/libs/armeabi-v7a/libusb1.0.so new file mode 100644 index 0000000..c12728c Binary files /dev/null and b/phenolib/libs/armeabi-v7a/libusb1.0.so differ diff --git a/phenolib/libs/armeabi-v7a/libusb100.so b/phenolib/libs/armeabi-v7a/libusb100.so deleted file mode 100644 index 20ec6fb..0000000 Binary files a/phenolib/libs/armeabi-v7a/libusb100.so and /dev/null differ diff --git a/phenolib/libs/armeabi-v7a/libuvc.so b/phenolib/libs/armeabi-v7a/libuvc.so index 6193ffc..8ebe2b1 100644 Binary files a/phenolib/libs/armeabi-v7a/libuvc.so and b/phenolib/libs/armeabi-v7a/libuvc.so differ diff --git a/phenolib/libs/armeabi-v7a/libyuv.so b/phenolib/libs/armeabi-v7a/libyuv.so new file mode 100644 index 0000000..06bf184 Binary files /dev/null and b/phenolib/libs/armeabi-v7a/libyuv.so differ diff --git a/phenolib/libs/x86/libUVCCamera.so b/phenolib/libs/x86/libUVCCamera.so index 2fa1fd7..351a351 100644 Binary files a/phenolib/libs/x86/libUVCCamera.so and b/phenolib/libs/x86/libUVCCamera.so differ diff --git a/phenolib/libs/x86/libjpeg-turbo1500.so b/phenolib/libs/x86/libjpeg-turbo1500.so deleted file mode 100644 index 2eca8fa..0000000 Binary files a/phenolib/libs/x86/libjpeg-turbo1500.so and /dev/null differ diff --git a/phenolib/libs/x86/libjpeg-turbo212.so b/phenolib/libs/x86/libjpeg-turbo212.so new file mode 100644 index 0000000..01f5fb2 Binary files /dev/null and b/phenolib/libs/x86/libjpeg-turbo212.so differ diff --git a/phenolib/libs/x86/libusb1.0.so b/phenolib/libs/x86/libusb1.0.so new file mode 100644 index 0000000..6dbc68a Binary files /dev/null and b/phenolib/libs/x86/libusb1.0.so differ diff --git a/phenolib/libs/x86/libusb100.so b/phenolib/libs/x86/libusb100.so deleted file mode 100644 index 2a6a22d..0000000 Binary files a/phenolib/libs/x86/libusb100.so and /dev/null differ diff --git a/phenolib/libs/x86/libuvc.so b/phenolib/libs/x86/libuvc.so index ed1748b..bea34af 100644 Binary files a/phenolib/libs/x86/libuvc.so and b/phenolib/libs/x86/libuvc.so differ diff --git a/phenolib/libs/x86/libyuv.so b/phenolib/libs/x86/libyuv.so new file mode 100644 index 0000000..4b4618e Binary files /dev/null and b/phenolib/libs/x86/libyuv.so differ diff --git a/phenolib/libs/x86_64/libUVCCamera.so b/phenolib/libs/x86_64/libUVCCamera.so index 5e17a13..0dbca6d 100644 Binary files a/phenolib/libs/x86_64/libUVCCamera.so and b/phenolib/libs/x86_64/libUVCCamera.so differ diff --git a/phenolib/libs/x86_64/libjpeg-turbo1500.so b/phenolib/libs/x86_64/libjpeg-turbo1500.so deleted file mode 100644 index f926096..0000000 Binary files a/phenolib/libs/x86_64/libjpeg-turbo1500.so and /dev/null differ diff --git a/phenolib/libs/x86_64/libjpeg-turbo212.so b/phenolib/libs/x86_64/libjpeg-turbo212.so new file mode 100644 index 0000000..1e50867 Binary files /dev/null and b/phenolib/libs/x86_64/libjpeg-turbo212.so differ diff --git a/phenolib/libs/x86_64/libusb1.0.so b/phenolib/libs/x86_64/libusb1.0.so new file mode 100644 index 0000000..aa9841e Binary files /dev/null and b/phenolib/libs/x86_64/libusb1.0.so differ diff --git a/phenolib/libs/x86_64/libusb100.so b/phenolib/libs/x86_64/libusb100.so deleted file mode 100644 index 5ef985d..0000000 Binary files a/phenolib/libs/x86_64/libusb100.so and /dev/null differ diff --git a/phenolib/libs/x86_64/libuvc.so b/phenolib/libs/x86_64/libuvc.so index d4caee4..bca18d0 100644 Binary files a/phenolib/libs/x86_64/libuvc.so and b/phenolib/libs/x86_64/libuvc.so differ diff --git a/phenolib/libs/x86_64/libyuv.so b/phenolib/libs/x86_64/libyuv.so new file mode 100644 index 0000000..1693e01 Binary files /dev/null and b/phenolib/libs/x86_64/libyuv.so differ