Skip to content

Merge main to dev #153

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 25 commits into from
Aug 14, 2025
Merged

Merge main to dev #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ce15024
Build(deps): Bump androidx.navigation:navigation-compose
dependabot[bot] Jul 16, 2025
1ec8d4a
Build(deps): Bump androidx.compose:compose-bom
dependabot[bot] Jul 16, 2025
e860b3e
Merge pull request #140 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Jul 16, 2025
7aeb805
Merge pull request #141 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Jul 16, 2025
c2781ce
Merge pull request #139 from Hepolise/dev
Hepolise Jul 19, 2025
093a2ee
Build(deps): Bump androidx.navigation:navigation-compose
dependabot[bot] Jul 30, 2025
84352b2
Merge pull request #143 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Jul 31, 2025
1bcdd51
Merge pull request #142 from Hepolise/dev
Hepolise Jul 31, 2025
9b0fbdc
Build(deps): Bump com.android.application from 8.11.1 to 8.12.0
dependabot[bot] Jul 31, 2025
354bd95
Merge pull request #145 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 1, 2025
6688085
Build(deps): Bump com.android.library from 8.11.1 to 8.12.0
dependabot[bot] Aug 1, 2025
f115ed1
Merge pull request #144 from Hepolise/dependabot/gradle/main/com.andr…
Hepolise Aug 1, 2025
01bd6a9
Build(deps): Bump actions/download-artifact from 4 to 5
dependabot[bot] Aug 6, 2025
5ae2696
Merge pull request #146 from Hepolise/dependabot/github_actions/main/…
Hepolise Aug 6, 2025
17d6554
Bump version
Hepolise Aug 7, 2025
4adb4cb
Build(deps): Bump actions/checkout from 4 to 5
dependabot[bot] Aug 12, 2025
b5aec62
Merge pull request #147 from Hepolise/dependabot/github_actions/main/…
Hepolise Aug 12, 2025
20b6747
Build(deps): Bump androidx.compose:compose-bom
dependabot[bot] Aug 14, 2025
0d16cea
Build(deps): Bump org.jetbrains.kotlin:kotlin-bom from 2.2.0 to 2.2.10
dependabot[bot] Aug 14, 2025
f1a705c
Build(deps): Bump org.jetbrains.kotlin.plugin.compose
dependabot[bot] Aug 14, 2025
5908459
Merge pull request #152 from Hepolise/dependabot/gradle/main/org.jetb…
Hepolise Aug 14, 2025
c31ba85
Merge pull request #151 from Hepolise/dependabot/gradle/main/org.jetb…
Hepolise Aug 14, 2025
ef590d5
Merge pull request #150 from Hepolise/dependabot/gradle/main/androidx…
Hepolise Aug 14, 2025
b597e68
Build(deps): Bump org.jetbrains.kotlin.android from 2.2.0 to 2.2.10
dependabot[bot] Aug 14, 2025
73b0360
Merge pull request #149 from Hepolise/dependabot/gradle/main/org.jetb…
Hepolise Aug 14, 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 @@ -32,7 +32,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Set up JDK 21
uses: actions/setup-java@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
needs: call-build
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Download Build Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: Build Artifacts

Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ android {
}

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

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

// Compose dependencies
implementation("androidx.activity:activity-compose:1.10.1")
Expand All @@ -49,7 +49,7 @@ dependencies {
implementation("androidx.core:core-splashscreen:1.0.1")

// Compose navigation
implementation("androidx.navigation:navigation-compose:2.9.1")
implementation("androidx.navigation:navigation-compose:2.9.3")

// Coil
implementation("io.coil-kt:coil-compose:2.7.0")
Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id("com.android.application") version "8.11.1" apply false
id("com.android.library") version "8.11.1" apply false
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" apply false
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
}

val versionName = "1.15.6"
val versionCode = 13
val versionName = "1.15.7"
val versionCode = 14

rootProject.ext.set("appVersionName", versionName)
rootProject.ext.set("appVersionCode", versionCode)
Expand Down