Compare commits
94 Commits
1.2c
...
87fb310ac2
Author | SHA1 | Date | |
---|---|---|---|
|
87fb310ac2 | ||
|
c6ca8ef754 | ||
|
2bc3372db1 | ||
|
76cbdb7832 | ||
|
87ea1df4cd | ||
|
ceffc79929 | ||
|
0914ebe475 | ||
|
f57bb2b935 | ||
|
d896124765 | ||
|
a3e06eea84 | ||
|
01d206fb2b | ||
|
d6824843f0 | ||
|
7635266a78 | ||
|
3b27d27c02 | ||
|
571f7d60cd | ||
|
ce23372932 | ||
|
1024b8f4aa | ||
|
73e2e20398 | ||
|
a95c6951f2 | ||
|
0966aa5054 | ||
|
8ca461ee0a | ||
|
6c7b1e2675 | ||
|
2359fdca81 | ||
|
998ed5abc0 | ||
|
e4452160f6 | ||
|
8e67f2d885 | ||
|
e3943b33ff | ||
|
e26055afe7 | ||
|
587607f7dc | ||
|
262dc08881 | ||
|
cea9c27d57 | ||
|
17a6526b29 | ||
|
a931335a2b | ||
|
aafd4f76d6 | ||
|
5d464826dc | ||
|
6eddd15d81 | ||
|
6fee471dec | ||
|
38727a239d | ||
|
83e2cf733e | ||
|
3214d772b2 | ||
|
40c3f39c49 | ||
|
6215ffa7b6 | ||
|
bf073da67b | ||
|
49fe5ca037 | ||
|
62f854db27 | ||
|
aea6fa6c69 | ||
|
029a1fcde7 | ||
|
92c99bec22 | ||
|
663c1236a4 | ||
|
a9582ffb05 | ||
|
b11fb89bd9 | ||
|
1e6bebe853 | ||
|
96904bce79 | ||
|
08675a5fc3 | ||
|
019046474c | ||
|
0e63b6a50d | ||
|
608ff610d8 | ||
a009ce0c15 | |||
|
1ba95c54a2 | ||
|
51987f54e1 | ||
|
efb3a436c4 | ||
|
8a22d3b66e | ||
|
c404d498d5 | ||
|
10d35956b3 | ||
|
1de639dc46 | ||
|
a297988d33 | ||
|
e788d064a5 | ||
|
d6692b5b7c | ||
|
5ac4ba1d43 | ||
|
50573a37c4 | ||
|
2528b7df5d | ||
|
e6159f6f42 | ||
|
f2982be549 | ||
|
0c5f7a658f | ||
|
9b90057f85 | ||
|
a9192314de | ||
|
aa08418109 | ||
|
5b239ace83 | ||
|
555cd8ada2 | ||
|
b188313eb9 | ||
|
74ea62e8cd | ||
|
a59d79aa0e | ||
|
e8021f37dd | ||
|
4e179d8698 | ||
|
a91f8545b0 | ||
|
94642047fb | ||
|
e99f615fcd | ||
|
3ba61e87f9 | ||
|
b798200883 | ||
|
2998362518 | ||
|
73e3add4a8 | ||
|
5b43db3ebd | ||
|
f9535fe2da | ||
|
aa20ec5a06
|
@@ -1,7 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application'
|
id 'com.android.application'
|
||||||
id 'org.jetbrains.kotlin.android'
|
id 'org.jetbrains.kotlin.android'
|
||||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0'
|
id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.21'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -72,13 +72,13 @@ android {
|
|||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
|
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
|
||||||
|
|
||||||
implementation 'androidx.camera:camera-lifecycle:1.3.4'
|
implementation 'androidx.camera:camera-lifecycle:1.4.2'
|
||||||
implementation 'androidx.camera:camera-view:1.3.4'
|
implementation 'androidx.camera:camera-view:1.4.2'
|
||||||
runtimeOnly 'androidx.camera:camera-camera2:1.3.4'
|
runtimeOnly 'androidx.camera:camera-camera2:1.4.2'
|
||||||
|
|
||||||
implementation 'com.google.code.gson:gson:2.11.0'
|
implementation 'com.google.code.gson:gson:2.13.1'
|
||||||
implementation 'com.google.android.material:material:1.12.0'
|
implementation 'com.google.android.material:material:1.12.0'
|
||||||
implementation 'com.google.zxing:core:3.5.3'
|
implementation 'com.google.zxing:core:3.5.3'
|
||||||
}
|
}
|
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:versionCode="7"
|
android:versionCode="8"
|
||||||
android:versionName="1.2b">
|
android:versionName="1.2c">
|
||||||
|
|
||||||
<uses-feature android:name="android.hardware.camera" />
|
<uses-feature android:name="android.hardware.camera" />
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.4.2' apply false
|
id 'com.android.application' version '8.10.1' apply false
|
||||||
id 'com.android.library' version '8.4.2' apply false
|
id 'com.android.library' version '8.10.1' apply false
|
||||||
id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
|
id 'org.jetbrains.kotlin.android' version '2.1.21' apply false
|
||||||
id 'com.autonomousapps.dependency-analysis' version '1.32.0' apply true
|
id 'com.autonomousapps.dependency-analysis' version '2.17.0' apply true
|
||||||
}
|
}
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
12
gradlew
vendored
12
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -112,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -203,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
@@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
6
gradlew.bat
vendored
6
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -68,11 +70,11 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
Reference in New Issue
Block a user