diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000..691cbcf --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,56 @@ +name: "Pr workflow" + +on: + pull_request: + types: [ opened, synchronize, edited, reopened ] + branches: + - master + +concurrency: + group: zebra-pr-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-latest + env: + GRADLE_OPTS: -Dorg.gradle.workers.max=4 -Dorg.gradle.parallel=true -Dkotlin.compiler.execution.strategy=in-process" + + steps: + - name: "Check out code" + uses: actions/checkout@v4 + + - name: "Setup java" + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 17 + + - name: "Build BasicIntent1" + run: ./gradlew :BasicIntent1:app:assembleDebug + + - name: "Build DataCapture1" + run: ./gradlew :DataCapture1:app:assembleDebug + + - name: "Build DocumentCaptureSample1" + run: ./gradlew :DocumentCaptureSample1:app:assembleDebug + + - name: "Build FreeFormOCRSample1" + run: ./gradlew :FreeFormOCRSample1:app:assembleDebug + + - name: "Build SignatureCapture1" + run: ./gradlew :SignatureCapture1:app:assembleDebug + + - name: "Build SignatureCapture2" + run: ./gradlew :SignatureCapture2:app:assembleDebug + + - name: "Build TruckLoadingDemo" + run: ./gradlew :TruckLoadingDemo:app:assembleDebug + + - name: "Upload reports" + uses: actions/upload-artifact@v3 + if: failure() + with: + name: Reports + path: '**/build/reports/*' + retention-days: 2 \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/BasicIntent1/app/build.gradle b/BasicIntent1/app/build.gradle index 8c792a8..05d6ae6 100755 --- a/BasicIntent1/app/build.gradle +++ b/BasicIntent1/app/build.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + namespace = "com.zebra.basicintent1" + compileSdkVersion 34 + defaultConfig { applicationId "com.zebra.basicintent1" minSdkVersion 16 @@ -18,10 +20,16 @@ android { } } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/BasicIntent1/app/src/main/AndroidManifest.xml b/BasicIntent1/app/src/main/AndroidManifest.xml index a96859a..d20afdc 100755 --- a/BasicIntent1/app/src/main/AndroidManifest.xml +++ b/BasicIntent1/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + - + diff --git a/SignatureCapture2/build.gradle b/SignatureCapture2/build.gradle index da05f02..818b823 100644 --- a/SignatureCapture2/build.gradle +++ b/SignatureCapture2/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.2.0' apply false - id 'com.android.library' version '7.2.0' apply false - id 'org.jetbrains.kotlin.android' version '1.6.10' apply false + id 'com.android.application' version '8.1.2' apply false + id 'com.android.library' version '8.1.2' apply false + id 'org.jetbrains.kotlin.android' version '1.9.20' apply false } task clean(type: Delete) { diff --git a/SignatureCapture2/gradle.properties b/SignatureCapture2/gradle.properties index fc45d2e..e4de97a 100644 --- a/SignatureCapture2/gradle.properties +++ b/SignatureCapture2/gradle.properties @@ -10,8 +10,18 @@ org.gradle.jvmargs=-Xmx2048m -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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configureondemand=true +org.gradle.parallel=true + # AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK +# Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true + +org.gradle.configuration-cache=true +org.gradle.configuration-cache.max-problems=5 \ No newline at end of file diff --git a/SignatureCapture2/gradle/wrapper/gradle-wrapper.properties b/SignatureCapture2/gradle/wrapper/gradle-wrapper.properties index d7daa91..c55c464 100644 --- a/SignatureCapture2/gradle/wrapper/gradle-wrapper.properties +++ b/SignatureCapture2/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ #Wed Sep 14 16:29:45 EEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists +validateDistributionUrl=true zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/TruckLoadingDemo/app/build.gradle b/TruckLoadingDemo/app/build.gradle index 4dc13ca..74a82c9 100644 --- a/TruckLoadingDemo/app/build.gradle +++ b/TruckLoadingDemo/app/build.gradle @@ -1,8 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + namespace = "com.zebra.truckloadingdemo" + compileSdkVersion 34 + buildFeatures { + aidl = true + } defaultConfig { applicationId "com.zebra.truckloadingdemo" @@ -24,11 +27,17 @@ android { } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/TruckLoadingDemo/app/src/main/AndroidManifest.xml b/TruckLoadingDemo/app/src/main/AndroidManifest.xml index 9907158..8105fd9 100644 --- a/TruckLoadingDemo/app/src/main/AndroidManifest.xml +++ b/TruckLoadingDemo/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +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` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..8064a67 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,7 @@ +includeBuild("BasicIntent1") +includeBuild("DataCapture1") +includeBuild("DocumentCaptureSample1") +includeBuild("FreeFormOCRSample1") +includeBuild("SignatureCapture1") +includeBuild("SignatureCapture2") +includeBuild("TruckLoadingDemo")