Skip to content
Open
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
22 changes: 11 additions & 11 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5
# Add cache-encryption-key if you set up the GRADLE_ENCRYPTION_KEY secret
# with:
# cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
Expand All @@ -52,7 +52,7 @@ jobs:
run: ./gradlew spotlessApply

- name: Commit Spotless changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v7
with:
commit_message: 🤖 Apply Spotless formatting
file_pattern: '**/*.kt **/*.kts **/*.java **/*.xml'
Expand All @@ -68,21 +68,21 @@ jobs:

- name: Upload build outputs (APKs)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: APKs
path: '**/build/outputs/apk/debug/*.apk'

- name: Upload JVM local test results (XML)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: local-test-results
path: '**/build/test-results/test*UnitTest/TEST-*.xml'

- name: Upload lint reports (HTML)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: lint-reports-html
path: '**/build/reports/lint-results-debug.html'
Expand Down Expand Up @@ -112,19 +112,19 @@ jobs:
sudo udevadm trigger --name-match=kvm

- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: Decode google-services.json
env:
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:

- name: Upload test reports
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: test-reports-${{ matrix.api-level }}
path: '**/build/reports/androidTests'
2 changes: 1 addition & 1 deletion gradle/init.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
val ktlintVersion = "1.5.0"

initscript {
val spotlessVersion = "7.0.2"
val spotlessVersion = "8.1.0"

repositories {
mavenCentral()
Expand Down
54 changes: 27 additions & 27 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
appVersionCode = "10"
appVersionName = "1.3.0"
appVersionWearOffset = "60000000"
agp = "8.13.1"
agp = "8.13.2"
bcpkixJdk18on = "1.83"
core = "1.7.0"
extensionsXr = "1.1.0"
Expand All @@ -12,75 +12,75 @@ javaVersion = "17"

#dependencies
accompanist = "0.37.3"
activityCompose = "1.12.1"
activityCompose = "1.12.2"
adaptive = "1.2.0"
apksig = "9.0.0-alpha06"
apksig = "9.0.0-rc01"
appcompat = "1.7.1"
baselineprofile = "1.4.1"
benchmarkMacroJunit4 = "1.4.1"
camerax = "1.5.2"
coilCompose = "3.3.0"
coilGif = "3.3.0"
composeBom = "2025.12.00"
composeBom = "2025.12.01"
concurrent = "1.3.0"
converterGson = "2.11.0"
converterGson = "3.0.0"
coreKtx = "1.17.0"
coreSplashscreen = "1.0.1"
coreSplashscreen = "1.2.0"
crashlytics = "3.0.6"
datastore = "1.1.7"
datastore = "1.2.0"
espressoCore = "3.7.0"
firebaseBom = "34.4.0"
firebaseBom = "34.7.0"
genaiPrompt = "1.0.0-alpha1"
googleServices = "4.4.4"
googleOss = "17.3.0"
googleOssPlugin = "0.10.9"
guava = "33.5.0-android"
googleOssPlugin = "0.10.10"
guava = "33.5.0-jre"
hiltAndroid = "2.57.2"
hiltLifecycleViewmodel = "1.0.0-alpha03"
hiltNavigationCompose = "1.3.0"
horologist = "0.7.15"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.2.21"
ksp = "2.2.20-2.0.3"
kotlin = "2.3.0"
ksp = "2.3.4"
kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "2.2.21"
kotlinxSerialization = "2.3.0"
kotlinxSerializationJson = "1.9.0"
kotlinxSerializationProtobuf = "1.9.0"
ktlint = "1.5.0"
lifecycleRuntimeKtx = "2.10.0"
lifecycleViewmodelNavigation3 = "1.0.0-alpha04"
lifecycleViewmodelNavigation3 = "2.10.0"
loggingInterceptor = "5.3.2"
material3 = "1.5.0-alpha10"
media3 = "1.8.0"
material3 = "1.5.0-alpha11"
media3 = "1.9.0"
navigation3 = "1.0.0"
okhttp = "4.12.0"
okhttp = "5.3.2"
playServicesWearable = "19.0.0"
playServicesBaseTesting = "16.2.0"
poseDetection = "18.0.0-beta5"
profileinstaller = "1.4.1"
retrofit = "2.11.0"
retrofit = "3.0.0"
robolectric = "4.16"
spotless = "8.0.0"
spotless = "8.1.0"
startup = "1.2.0"
runner = "1.7.0"
uiTextGoogleFonts = "1.9.3"
uiTextGoogleFonts = "1.10.0"
uiautomator = "2.4.0-alpha07"
uiTooling = "1.10.0"
validatorPush = "1.0.0-alpha08"
watchFacePush = "1.0.0-alpha01"
watchFacePush = "1.0.0-beta01"
wear = "1.3.0"
wearCompose = "1.5.0"
wearComposeTooling = "1.4.1"
wearCompose = "1.5.6"
wearComposeTooling = "1.5.6"
wearRemoteInteractions = "1.1.0"
window = "1.5.0"
lifecycleProcess = "2.9.4"
window = "1.5.1"
lifecycleProcess = "2.10.0"
mlkitCommon = "18.11.0"
mlkitSegmentation = "16.0.0-beta1"
playServicesBase = "18.9.0"
timber = "5.0.1"
workRuntimeKtx = "2.10.5"
xr-compose = "1.0.0-alpha07"
workRuntimeKtx = "2.11.0"
xr-compose = "1.0.0-alpha09"

[libraries]
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 03 08:56:48 BST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
17 changes: 8 additions & 9 deletions watchface/pack-java/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion watchface/pack-java/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pack-api = { git = "https://github.com/google/pack.git" }
#pack-api = { path = "../pack/pack-api" }
jni = "0.21.1"
base64 = "0.22.1"
android_logger = "0.13"
android_logger = "0.15"
log = "0.4"

[workspace]
Loading