Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
packagingOptions {
resources {
Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext.versions = [
minSdk: 16,
compileSdk: 33,
buildTools: "29.0.3",
publishVersion: "0.9.53",
publishVersion: "0.9.54",
publishVersionCode: 1
]

Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions phenolib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
Expand Down Expand Up @@ -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 {
Expand Down
Binary file modified phenolib/libs/arm64-v8a/libUVCCamera.so
Binary file not shown.
Binary file removed phenolib/libs/arm64-v8a/libjpeg-turbo1500.so
Binary file not shown.
Binary file added phenolib/libs/arm64-v8a/libjpeg-turbo212.so
Binary file not shown.
Binary file added phenolib/libs/arm64-v8a/libusb1.0.so
Binary file not shown.
Binary file removed phenolib/libs/arm64-v8a/libusb100.so
Binary file not shown.
Binary file modified phenolib/libs/arm64-v8a/libuvc.so
Binary file not shown.
Binary file added phenolib/libs/arm64-v8a/libyuv.so
Binary file not shown.
Binary file modified phenolib/libs/armeabi-v7a/libUVCCamera.so
Binary file not shown.
Binary file removed phenolib/libs/armeabi-v7a/libjpeg-turbo1500.so
Binary file not shown.
Binary file added phenolib/libs/armeabi-v7a/libjpeg-turbo212.so
Binary file not shown.
Binary file added phenolib/libs/armeabi-v7a/libusb1.0.so
Binary file not shown.
Binary file removed phenolib/libs/armeabi-v7a/libusb100.so
Binary file not shown.
Binary file modified phenolib/libs/armeabi-v7a/libuvc.so
Binary file not shown.
Binary file added phenolib/libs/armeabi-v7a/libyuv.so
Binary file not shown.
Binary file modified phenolib/libs/x86/libUVCCamera.so
Binary file not shown.
Binary file removed phenolib/libs/x86/libjpeg-turbo1500.so
Binary file not shown.
Binary file added phenolib/libs/x86/libjpeg-turbo212.so
Binary file not shown.
Binary file added phenolib/libs/x86/libusb1.0.so
Binary file not shown.
Binary file removed phenolib/libs/x86/libusb100.so
Binary file not shown.
Binary file modified phenolib/libs/x86/libuvc.so
Binary file not shown.
Binary file added phenolib/libs/x86/libyuv.so
Binary file not shown.
Binary file modified phenolib/libs/x86_64/libUVCCamera.so
Binary file not shown.
Binary file removed phenolib/libs/x86_64/libjpeg-turbo1500.so
Binary file not shown.
Binary file added phenolib/libs/x86_64/libjpeg-turbo212.so
Binary file not shown.
Binary file added phenolib/libs/x86_64/libusb1.0.so
Binary file not shown.
Binary file removed phenolib/libs/x86_64/libusb100.so
Binary file not shown.
Binary file modified phenolib/libs/x86_64/libuvc.so
Binary file not shown.
Binary file added phenolib/libs/x86_64/libyuv.so
Binary file not shown.
Loading