Skip to content

Merge 1.0.1 dev branch into main #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eamo5 merged 8 commits into from
Sep 17, 2025
Merged

Merge 1.0.1 dev branch into main #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdb734d
Bump gradle and AGP version
Eamo5 Mar 24, 2025
f338a45
Target SDK 35
Eamo5 Mar 24, 2025
52d03d9
Target SDK 36
Eamo5 Sep 12, 2025
c848b14
Bump AGP and Gradle versions
Eamo5 Sep 12, 2025
28cf4b0
Bump Kotlin version to 2.2.20
Eamo5 Sep 12, 2025
539cdd7
Pull in latest watchface-tools changes
Eamo5 Sep 12, 2025
68d4145
Refactor gradle validation tasks
Eamo5 Sep 12, 2025
84a2266
Bump app version to 1.0.1
Eamo5 Sep 12, 2025
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
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
agp = "8.8.0"
kotlin = "1.9.24"
compileSdk = "34"
agp = "8.13.0"
kotlin = "2.2.20"
compileSdk = "36"
minSdk = "34"
targetSdk = "34"
targetSdk = "36"
# SDK version + version name + iteration
wear4VersionCode = "331001"
wear5VersionCode = "341001"
versionName = "1.0.0"
wear4VersionCode = "331010"
wear5VersionCode = "341010"
versionName = "1.0.1"

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Dec 07 01:24:52 AEDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion watchface-tools
Open in desktop
Submodule watchface-tools updated 246 files
Loading