diff options
| -rw-r--r-- | .github/workflows/make-apk.yml | 14 | ||||
| -rw-r--r-- | build.gradle | 186 | ||||
| -rw-r--r-- | build.gradle.kts | 172 | ||||
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 59203 -> 43764 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 5 | ||||
| -rwxr-xr-x | gradlew | 286 | ||||
| -rw-r--r-- | gradlew.bat | 41 | ||||
| -rw-r--r-- | settings.gradle.kts (renamed from settings.gradle) | 0 | ||||
| -rw-r--r-- | shell.nix | 2 |
10 files changed, 383 insertions, 324 deletions
diff --git a/.github/workflows/make-apk.yml b/.github/workflows/make-apk.yml index 19baf9e..c7c7c5b 100644 --- a/.github/workflows/make-apk.yml +++ b/.github/workflows/make-apk.yml @@ -9,10 +9,6 @@ jobs: Build-Apk: runs-on: ubuntu-latest steps: - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' # See 'Supported distributions' for available options - java-version: '17' - name: Checkout repo uses: actions/checkout@v4 - name: Restore debug keystore from GitHub Secrets @@ -28,15 +24,19 @@ jobs: gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore" fi fi + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build debug APK - uses: gradle/gradle-build-action@v3 + run: ./gradlew assembleDebug env: DEBUG_KEYSTORE: "debug.keystore" DEBUG_KEYSTORE_PASSWORD: debug0 DEBUG_KEY_ALIAS: debug DEBUG_KEY_PASSWORD: debug0 - with: - arguments: assembleDebug - name: Artifact naming run: | artifact="${{github.repository_owner}} ${{github.ref_name}}" diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 444525e..0000000 --- a/build.gradle +++ /dev/null @@ -1,186 +0,0 @@ -plugins { - id 'com.android.application' version '8.6.0' -} - -dependencies { - implementation "androidx.window:window-java:1.3.0" - implementation "androidx.core:core:1.16.0" - testImplementation "junit:junit:4.13.2" -} - -android { - namespace 'juloo.keyboard2' - compileSdk 35 - - defaultConfig { - applicationId "juloo.keyboard2" - minSdk 21 - targetSdkVersion 35 - versionCode 50 - versionName "1.32.1" - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['srcs/juloo.keyboard2'] - res.srcDirs = ['res', 'build/generated-resources'] - assets.srcDirs = ['assets'] - } - - test { - java.srcDirs = ['test'] - } - } - - signingConfigs { - // Debug builds will always be signed. If no environment variables are set, a default - // keystore will be initialized by the task initDebugKeystore and used. This keystore - // can be uploaded to GitHub secrets by following instructions in CONTRIBUTING.md - // in order to always receive correctly signed debug APKs from the CI. - debug { - storeFile(System.env.DEBUG_KEYSTORE ? file(System.env.DEBUG_KEYSTORE) : file("debug.keystore")) - storePassword(System.env.DEBUG_KEYSTORE_PASSWORD ? "$System.env.DEBUG_KEYSTORE_PASSWORD" : "debug0") - keyAlias(System.env.DEBUG_KEY_ALIAS ? "$System.env.DEBUG_KEY_ALIAS" : "debug") - keyPassword(System.env.DEBUG_KEY_PASSWORD ? "$System.env.DEBUG_KEY_PASSWORD" : "debug0") - } - - release { - if (System.env.RELEASE_KEYSTORE) { - storeFile file(System.env.RELEASE_KEYSTORE) - storePassword "$System.env.RELEASE_KEYSTORE_PASSWORD" - keyAlias "$System.env.RELEASE_KEY_ALIAS" - keyPassword "$System.env.RELEASE_KEY_PASSWORD" - } - } - } - - buildTypes { - release { - minifyEnabled true - shrinkResources true - debuggable false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') - resValue "string", "app_name", "@string/app_name_release" - signingConfig signingConfigs.release - } - - debug { - minifyEnabled false - shrinkResources false - debuggable true - applicationIdSuffix ".debug" - resValue "string", "app_name", "@string/app_name_debug" - resValue "bool", "debug_logs", "true" - signingConfig signingConfigs.debug - } - } - - // Name outputs after the application ID. - android.applicationVariants.all { variant -> - variant.outputs.all { - outputFileName = "${applicationId}.apk" - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - } -} - -tasks.register('buildKeyboardFont') { - println "\nBuilding assets/special_font.ttf" - mkdir "$buildDir" - exec { - workingDir "$projectDir/srcs/special_font" - def svgFiles = workingDir.listFiles().findAll { - it.isFile() && it.name.endsWith(".svg") - } - commandLine("fontforge", "-lang=ff", "-script", "build.pe", "$buildDir/special_font.ttf", *svgFiles) - } - copy { - from "$buildDir/special_font.ttf" - into "assets" - } -} - -tasks.register('genEmojis') { - println "\nGenerating res/raw/emojis.txt" - exec { - workingDir = projectDir - commandLine "python", "gen_emoji.py" - } -} - -tasks.withType(Test).configureEach { - dependsOn 'genLayoutsList' - dependsOn 'checkKeyboardLayouts' - dependsOn 'compileComposeSequences' -} - -tasks.register('genLayoutsList') { - println "\nGenerating res/values/layouts.xml" - exec { - workingDir = projectDir - commandLine "python", "gen_layouts.py" - } -} - -tasks.register('checkKeyboardLayouts') { - println "\nChecking layouts" - exec { - workingDir = projectDir - commandLine("python", "check_layout.py") - } -} - -tasks.register('compileComposeSequences') { - def out = "srcs/juloo.keyboard2/ComposeKeyData.java" - println "\nGenerating ${out}" - exec { - def sequences = new File(projectDir, "srcs/compose").listFiles().findAll { - !it.name.endsWith(".py") && !it.name.endsWith(".md") - } - workingDir = projectDir - commandLine("python", "srcs/compose/compile.py", *sequences) - standardOutput = new FileOutputStream("${projectDir}/${out}") - } -} - -tasks.named("preBuild") { - dependsOn += "initDebugKeystore" - dependsOn += "copyRawQwertyUS" - dependsOn += "copyLayoutDefinitions" -} - -tasks.register('initDebugKeystore') { - if (!file("debug.keystore").exists()) { - println "Initializing default debug keystore" - exec { - // A shell script might be needed if this line requires input from the user - commandLine "keytool", "-genkeypair", "-dname", "cn=d, ou=e, o=b, c=ug", "-alias", "debug", "-keypass", "debug0", "-keystore", "debug.keystore", "-keyalg", "rsa", "-storepass", "debug0", "-validity", "10000" - } - } -} - -// latn_qwerty_us is used as a raw resource by the custom layout option. -tasks.register('copyRawQwertyUS') -{ - copy { - from "srcs/layouts/latn_qwerty_us.xml" - into "build/generated-resources/raw" - } -} - -tasks.register('copyLayoutDefinitions') -{ - copy { - from "srcs/layouts" - include "*.xml" - into "build/generated-resources/xml" - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..fd27aba --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,172 @@ +import com.android.build.gradle.internal.api.BaseVariantOutputImpl +import java.io.FileOutputStream + +plugins { + id("com.android.application") version "8.13.0" +} + +dependencies { + implementation("androidx.window:window-java:1.3.0") + implementation("androidx.core:core:1.16.0") + testImplementation("junit:junit:4.13.2") +} + +android { + namespace = "juloo.keyboard2" + compileSdkVersion = "android-35" + + defaultConfig { + applicationId = "juloo.keyboard2" + minSdk = 21 + targetSdk { version = release(35) } + versionCode = 50 + versionName = "1.32.1" + } + + sourceSets { + named("main") { + manifest.srcFile("AndroidManifest.xml") + java.srcDirs("srcs/juloo.keyboard2") + res.srcDirs("res", "build/generated-resources") + assets.srcDirs("assets") + } + + named("test") { + java.srcDirs("test") + } + } + + signingConfigs { + // Debug builds will always be signed. If no environment variables are set, a default + // keystore will be initialized by the task initDebugKeystore and used. This keystore + // can be uploaded to GitHub secrets by following instructions in CONTRIBUTING.md + // in order to always receive correctly signed debug APKs from the CI. + named("debug") { + storeFile = file(System.getenv("DEBUG_KEYSTORE") ?: "debug.keystore") + storePassword = System.getenv("DEBUG_KEYSTORE_PASSWORD") ?: "debug0" + keyAlias = System.getenv("DEBUG_KEY_ALIAS") ?: "debug" + keyPassword = System.getenv("DEBUG_KEY_PASSWORD") ?: "debug0" + } + + create("release") { + val ks = System.getenv("RELEASE_KEYSTORE") + if (ks != null) { + storeFile = file(ks) + storePassword = System.getenv("RELEASE_KEYSTORE_PASSWORD") + keyAlias = System.getenv("RELEASE_KEY_ALIAS") + keyPassword = System.getenv("RELEASE_KEY_PASSWORD") + } + } + } + + buildTypes { + named("release") { + isMinifyEnabled = true + isShrinkResources = true + isDebuggable = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt")) + resValue("string", "app_name", "@string/app_name_release") + signingConfig = signingConfigs["release"] + } + + named("debug") { + isMinifyEnabled = false + isShrinkResources = false + isDebuggable = true + applicationIdSuffix = ".debug" + resValue("string", "app_name", "@string/app_name_debug") + resValue("bool", "debug_logs", "true") + signingConfig = signingConfigs["debug"] + } + } + + // Name outputs after the application ID. + android.applicationVariants.forEach { variant -> + variant.outputs.forEach { + it as BaseVariantOutputImpl + it.outputFileName = "${variant.applicationId}.apk" + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} + +val buildKeyboardFont by tasks.registering(Exec::class) { + val `in` = projectDir.resolve("srcs/special_font") + val out = layout.projectDirectory.file("assets/special_font.ttf") + inputs.dir(`in`) + outputs.file(out) + doFirst { println("\nBuilding assets/special_font.ttf") } + workingDir = `in` + val svgFiles = `in`.listFiles()!!.filter { + it.isFile && it.name.endsWith(".svg") + }.toTypedArray() + commandLine("fontforge", "-lang=ff", "-script", "build.pe", out.asFile.absolutePath, *svgFiles) +} + +val genEmojis by tasks.registering(Exec::class) { + doFirst { println("\nGenerating res/raw/emojis.txt") } + workingDir = projectDir + commandLine("python", "gen_emoji.py") +} + +val genLayoutsList by tasks.registering(Exec::class) { + inputs.dir(projectDir.resolve("srcs/layouts")) + outputs.file(projectDir.resolve("res/values/layouts.xml")) + doFirst { println("\nGenerating res/values/layouts.xml") } + workingDir = projectDir + commandLine("python", "gen_layouts.py") +} + +val checkKeyboardLayouts by tasks.registering(Exec::class) { + inputs.dir(projectDir.resolve("srcs/layouts")) + inputs.file(projectDir.resolve("srcs/juloo.keyboard2/KeyValue.java")) + outputs.file(projectDir.resolve("check_layout.output")) + doFirst { println("\nChecking layouts") } + workingDir = projectDir + commandLine("python", "check_layout.py") +} + +val compileComposeSequences by tasks.registering(Exec::class) { + val `in` = projectDir.resolve("srcs/compose") + val out = projectDir.resolve("srcs/juloo.keyboard2/ComposeKeyData.java") + inputs.dir(`in`) + outputs.file(out) + doFirst { println("\nGenerating $out") } + val sequences = `in`.listFiles { it: File -> + !it.name.endsWith(".py") && !it.name.endsWith(".md") + }!!.map { it.absolutePath }.toTypedArray() + workingDir = projectDir + commandLine("python", `in`.resolve("compile.py").absolutePath, *sequences) + doFirst { standardOutput = FileOutputStream(out) } +} + +tasks.withType(Test::class).configureEach { + dependsOn(genEmojis, genLayoutsList, checkKeyboardLayouts, compileComposeSequences) +} + +val initDebugKeystore by tasks.registering(Exec::class) { + doFirst { println("Initializing default debug keystore") } + isEnabled = !file("debug.keystore").exists() + // A shell script might be needed if this line requires input from the user + commandLine("keytool", "-genkeypair", "-dname", "cn=d, ou=e, o=b, c=ug", "-alias", "debug", "-keypass", "debug0", "-keystore", "debug.keystore", "-keyalg", "rsa", "-storepass", "debug0", "-validity", "10000") +} + +// latn_qwerty_us is used as a raw resource by the custom layout option. +val copyRawQwertyUS by tasks.registering(Copy::class) { + from("srcs/layouts/latn_qwerty_us.xml") + into("build/generated-resources/raw") +} + +val copyLayoutDefinitions by tasks.registering(Copy::class) { + from("srcs/layouts") + include("*.xml") + into("build/generated-resources/xml") +} + +tasks.named("preBuild") { + dependsOn(initDebugKeystore, copyRawQwertyUS, copyLayoutDefinitions, compileComposeSequences) +} diff --git a/gradle.properties b/gradle.properties index 81039a2..85cc59b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 android.useAndroidX=true android.nonTransitiveRClass=true +org.gradle.configuration-cache=true
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex e708b1c..1b33c55 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3227f43..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Aug 21 18:13:41 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,115 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac 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='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +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. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# 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 +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @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 @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle.kts index 649cd46..649cd46 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ let jdk = pkgs.openjdk17; - build_tools_version = "34.0.0"; + build_tools_version = "35.0.0"; android = pkgs.androidenv.composeAndroidPackages { buildToolsVersions = [ build_tools_version ]; |