Skip to content

Merge main to dev #170

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
Hepolise merged 23 commits into from
Sep 10, 2025
Merged

Merge main to dev #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c4596a7
Build(deps): Bump com.android.application from 8.12.0 to 8.12.1
dependabot[bot] Aug 19, 2025
bb3ac92
Merge pull request #154 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 19, 2025
b44ff71
Build(deps): Bump com.android.library from 8.12.0 to 8.12.1
dependabot[bot] Aug 19, 2025
ac15e8b
Merge pull request #155 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 19, 2025
ebd52aa
Merge pull request #156 from Hepolise/dev
Hepolise Aug 19, 2025
8bd6b5d
Build(deps): Bump androidx.core:core-ktx from 1.16.0 to 1.17.0
dependabot[bot] Aug 19, 2025
e4f701e
Merge pull request #148 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Aug 19, 2025
5c691ba
Merge pull request #157 from Hepolise/dev
Hepolise Aug 19, 2025
9f95ee4
Build(deps): Bump actions/setup-java from 4 to 5
dependabot[bot] Aug 22, 2025
48a9c45
Merge pull request #158 from Hepolise/dependabot/github_actions/main/…
Hepolise Aug 22, 2025
9f660c5
Build(deps): Bump androidx.compose:compose-bom
dependabot[bot] Aug 27, 2025
c975e5d
Merge pull request #159 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Aug 28, 2025
c0ef56d
Build(deps): Bump com.android.application from 8.12.1 to 8.12.2
dependabot[bot] Aug 28, 2025
8c38cab
Merge pull request #160 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 28, 2025
8a554c8
Build(deps): Bump com.android.library from 8.12.1 to 8.12.2
dependabot[bot] Aug 28, 2025
fa9f210
Merge pull request #161 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 28, 2025
03ca90e
Build(deps): Bump com.android.application from 8.12.2 to 8.13.0 (#162)
dependabot[bot] Sep 3, 2025
9c293ab
Build(deps): Bump com.android.library from 8.12.2 to 8.13.0 (#163)
dependabot[bot] Sep 3, 2025
f383fbb
Build(deps): Bump org.jetbrains.kotlin.plugin.compose (#164)
dependabot[bot] Sep 10, 2025
bb108e3
Build(deps): Bump androidx.compose:compose-bom (#165)
dependabot[bot] Sep 10, 2025
2f1a901
Build(deps): Bump org.jetbrains.kotlin:kotlin-bom from 2.2.10 to 2.2.…
dependabot[bot] Sep 10, 2025
6a47f7b
Build(deps): Bump androidx.activity:activity-compose (#167)
dependabot[bot] Sep 10, 2025
96b64ec
Build(deps): Bump org.jetbrains.kotlin.android from 2.2.10 to 2.2.20 …
dependabot[bot] Sep 10, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v5

- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ android {
}

dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.2.10"))
implementation("androidx.core:core-ktx:1.16.0")
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.2.20"))
implementation("androidx.core:core-ktx:1.17.0")

// Compose BOM (Bill of Materials)
implementation(platform("androidx.compose:compose-bom:2025.08.00"))
implementation(platform("androidx.compose:compose-bom:2025.09.00"))

// Compose dependencies
implementation("androidx.activity:activity-compose:1.10.1")
implementation("androidx.activity:activity-compose:1.11.0")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3:1.3.2")
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application") version "8.12.0" apply false
id("com.android.library") version "8.12.0" apply false
id("org.jetbrains.kotlin.android") version "2.2.10" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.10" apply false
id("com.android.application") version "8.13.0" apply false
id("com.android.library") version "8.13.0" apply false
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
}

val versionName = "1.15.7"
Expand Down