diff --git a/.gitignore b/.gitignore index d9cf2cacc..a62761885 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,5 @@ app/debug/* app/schemas/* # Mac DS_Store files -.DS_Store \ No newline at end of file +.DS_Store +.kotlin/ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 25375d32c..e8d8f2509 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,9 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'com.google.devtools.ksp' + id 'org.jetbrains.kotlin.plugin.compose' +} repositories { mavenCentral() @@ -8,7 +11,7 @@ repositories { } android { - compileSdk 34 + compileSdk 35 signingConfigs { debug { @@ -19,7 +22,7 @@ android { defaultConfig { applicationId "com.cooper.wheellog" minSdk 21 - targetSdk 34 + targetSdk 35 versionCode 125 versionName "3.1.10b" buildConfigField 'String', 'BUILD_TIME', "\"" + new Date().format('HH:mm dd.MM.yyyy') + "\"" @@ -34,8 +37,8 @@ android { "room.expandProjection":"true"] } } - kapt { - arguments {arg("room.schemaLocation", "$projectDir/schemas")} + ksp { + arg("room.schemaLocation", "$projectDir/schemas") } } buildTypes { @@ -51,7 +54,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - buildTypes.all { buildType -> + buildTypes.configureEach { buildType -> // private properties def props = new Properties() def propsPath = "../local.properties" @@ -68,9 +71,10 @@ android { buildFeatures { viewBinding true compose true + buildConfig true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.2" + kotlinCompilerExtensionVersion = "1.5.3" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -111,8 +115,8 @@ dependencies { implementation "androidx.compose.runtime:runtime:$compose_version" implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui-tooling:$compose_version" - implementation 'androidx.compose.material3:material3:1.1.2' - implementation 'androidx.navigation:navigation-compose:2.7.4' + implementation 'androidx.compose.material3:material3:1.3.1' + implementation 'androidx.navigation:navigation-compose:2.8.5' implementation "androidx.compose.material:material-icons-extended:$compose_version" // ViewModel implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" @@ -122,7 +126,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" // database implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-ktx:$room_version" // bluetooth implementation 'com.github.weliem:blessed-android:2.4.1' @@ -132,40 +136,39 @@ dependencies { // pebble implementation 'com.getpebble:pebblekit:4.0.1' // wearOs - implementation 'com.google.android.gms:play-services-wearable:18.1.0' + implementation 'com.google.android.gms:play-services-wearable:19.0.0' wearApp project(':wearos') // common implementation "androidx.core:core-ktx:$core_ktx_version" implementation "androidx.appcompat:appcompat:$appcompact_version" implementation "com.google.android.material:material:$material_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'me.relex:circleindicator:2.1.6' implementation 'com.jakewharton.timber:timber:5.0.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' - implementation 'org.osmdroid:osmdroid-android:6.1.18' + implementation 'org.osmdroid:osmdroid-android:6.1.20' implementation 'org.nanohttpd:nanohttpd:2.3.1' - implementation 'com.google.guava:guava:32.1.2-jre' - implementation 'com.squareup.okhttp3:okhttp:4.9.0' + implementation 'com.google.guava:guava:33.4.0-jre' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' // coroutines - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1' // AppMetrica SDK. // implementation ('com.yandex.android:mobmetricalib:5.3.0') { // exclude group: 'com.yandex.android', module: 'mobmetricalib-identifiers' // } testImplementation 'junit:junit:4.13.2' - testImplementation 'com.google.truth:truth:1.1.5' - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' - testImplementation 'io.mockk:mockk:1.13.8' - testImplementation 'org.robolectric:robolectric:4.10.3' - testImplementation 'androidx.test:core:1.5.0' + testImplementation 'com.google.truth:truth:1.4.4' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4' + testImplementation 'io.mockk:mockk:1.13.14' + testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'androidx.test:core:1.6.1' testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0' - testImplementation 'org.json:json:20230618' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0' + testImplementation 'org.json:json:20241224' } diff --git a/app/src/main/java/com/cooper/wheellog/BluetoothService.kt b/app/src/main/java/com/cooper/wheellog/BluetoothService.kt index 011e5b5b5..980bc315b 100644 --- a/app/src/main/java/com/cooper/wheellog/BluetoothService.kt +++ b/app/src/main/java/com/cooper/wheellog/BluetoothService.kt @@ -277,7 +277,7 @@ class BluetoothService: Service() { } val magicPeriod = 15000 reconnectTimer = Timer().apply { - scheduleAtFixedRate(object : TimerTask() { + schedule(object : TimerTask() { override fun run() { val wd = WheelData.getInstance() if (connectionState == ConnectionState.CONNECTED @@ -529,6 +529,12 @@ class BluetoothService: Service() { return mDisconnectTime } + override fun onTimeout(startId: Int) { + super.onTimeout(startId) + Timber.e("BluetoothService stops on timeout") + stopSelf() + } + private fun startBeepTimer() { wl = mgr?.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLogTag)?.apply { acquire(5 * 60 * 1000L /*5 minutes*/) @@ -545,7 +551,7 @@ class BluetoothService: Service() { } } beepTimer = Timer().apply { - scheduleAtFixedRate( + schedule( beepTimerTask, noConnectionSound.toLong(), noConnectionSound.toLong() diff --git a/app/src/main/java/com/cooper/wheellog/WheelLog.kt b/app/src/main/java/com/cooper/wheellog/WheelLog.kt index 190aa600b..eaa3feacc 100644 --- a/app/src/main/java/com/cooper/wheellog/WheelLog.kt +++ b/app/src/main/java/com/cooper/wheellog/WheelLog.kt @@ -1,11 +1,8 @@ package com.cooper.wheellog import android.app.Application -// import com.yandex.metrica.YandexMetricaConfig -// import com.yandex.metrica.YandexMetrica import com.cooper.wheellog.utils.NotificationUtil import com.cooper.wheellog.utils.VolumeKeyController -import com.cooper.wheellog.utils.ThemeManager import android.content.ContentResolver import android.content.Context import android.content.res.Configuration @@ -32,12 +29,19 @@ class WheelLog : Application() { // } } - override fun attachBaseContext(base: Context) { + override fun attachBaseContext(base: Context?) { var mContext = base - AppConfig = AppConfig(mContext) - mContext = LocaleManager.setLocale(mContext) - Notifications = NotificationUtil(mContext) - VolumeKeyController = VolumeKeyController(mContext) + if (mContext != null) { + Timber.d("attachBaseContext") + AppConfig = AppConfig(mContext) + mContext = LocaleManager.setLocale(mContext) + Notifications = NotificationUtil(mContext) + VolumeKeyController = VolumeKeyController(mContext) + } + else + { + Timber.e("attachBaseContext with null context") + } super.attachBaseContext(mContext) } diff --git a/build.gradle b/build.gradle index 6878cc48d..0a36a9031 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.9.0' - ext.compose_version = '1.5.3' - ext.lifecycle_version = '2.6.2' - ext.room_version = '2.5.2' - ext.material_version = '1.10.0' - ext.appcompact_version = '1.6.1' - ext.core_ktx_version = '1.12.0' + ext.kotlin_version = '2.0.21' + ext.compose_version = '1.7.6' + ext.lifecycle_version = '2.8.7' + ext.room_version = '2.6.1' + ext.material_version = '1.12.0' + ext.appcompact_version = '1.7.0' + ext.core_ktx_version = '1.15.0' repositories { mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.8.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -22,6 +22,11 @@ buildscript { } } +plugins { + id 'com.google.devtools.ksp' version '2.0.21-1.0.27' apply false + id 'org.jetbrains.kotlin.plugin.compose' version '2.0.21' apply false +} + allprojects { repositories { mavenCentral() @@ -31,5 +36,5 @@ allprojects { } tasks.register('clean', Delete) { - delete rootProject.buildDir + delete rootProject.path } diff --git a/gradle.properties b/gradle.properties index 2c43406e5..035cdbde8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,9 +16,9 @@ # 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 -android.defaults.buildfeatures.buildconfig=true -android.enableJetifier=true -android.nonFinalResIds=false -android.nonTransitiveRClass=false -android.useAndroidX=true -org.gradle.jvmargs=-Xms2560m -Xmx4096m -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=225m -XX:+UseCompressedOops \ No newline at end of file +android.enableJetifier = true +android.nonFinalResIds = false +android.nonTransitiveRClass = false +android.useAndroidX = true +org.gradle.configuration-cache = true +org.gradle.jvmargs = -Xms2560m -Xmx4096m -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=225m -XX:+UseCompressedOops \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5..2c3521197 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f573cd80e..df97d72b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Oct 12 22:53:09 MSK 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip \ No newline at end of file diff --git a/gradlew b/gradlew index cccdd3d51..f5feea6d6 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,130 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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="" +# 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 +' "$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 + # 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 @@ -81,92 +133,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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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\"" + 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=$((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" -# 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")" +# 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, 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" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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 e95643d6a..9b42019c7 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ 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% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +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 @@ -35,48 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +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 -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :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/shared/build.gradle b/shared/build.gradle index 689230d85..88afd409b 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 21 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -36,7 +36,7 @@ dependencies { implementation "com.google.android.material:material:$material_version" testImplementation 'junit:junit:4.13.2' - testImplementation 'com.google.truth:truth:1.1.5' - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' - testImplementation 'io.mockk:mockk:1.13.8' + testImplementation 'com.google.truth:truth:1.4.4' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4' + testImplementation 'io.mockk:mockk:1.13.14' } \ No newline at end of file diff --git a/wearos/build.gradle b/wearos/build.gradle index a66302c24..32bce65fb 100644 --- a/wearos/build.gradle +++ b/wearos/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.cooper.wheellog" minSdkVersion 24 - targetSdk 34 + targetSdk 35 versionCode 103 versionName "1.0.11" multiDexEnabled true @@ -55,12 +55,12 @@ dependencies { implementation "androidx.appcompat:appcompat:$appcompact_version" implementation "com.google.android.material:material:$material_version" implementation 'com.google.android.support:wearable:2.9.0' - implementation 'com.google.android.gms:play-services-wearable:18.1.0' + implementation 'com.google.android.gms:play-services-wearable:19.0.0' implementation 'androidx.wear:wear:1.3.0' implementation project(path: ':shared') testImplementation 'junit:junit:4.13.2' compileOnly 'com.google.android.wearable:wearable:2.9.0' // coroutines - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1' } \ No newline at end of file