Merge branch 'refs/heads/main' into migrate-to-androidx-viewmodel

# Conflicts: # gradle/libs.versions.toml
joelkanyi · Sep 14, 2024 · 8ee189a · 8ee189a
2 parents a0ea40f + 432be6d
commit 8ee189a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
             desktop/build/compose/jars/*.jar  
 
       - name: Release
-        uses: softprops/action-gh-release@a485adba73bc95d9848c86e019d675bac99de0ed
+        uses: softprops/action-gh-release@9a28f2423fd7ba2781181bb13e8aba228027c4e9
         with:
           prerelease: ${{ contains(github.event.inputs.version, '-rc') || contains(github.event.inputs.version, '-b') || contains(github.event.inputs.version, '-a') }}
           files: |
@@ -109,7 +109,7 @@ jobs:
           path: android/build/outputs/apk/release/*.apk
 
       - name: Release
-        uses: softprops/action-gh-release@a485adba73bc95d9848c86e019d675bac99de0ed
+        uses: softprops/action-gh-release@9a28f2423fd7ba2781181bb13e8aba228027c4e9
         with:
           prerelease: ${{ contains(github.event.inputs.version, '-rc') || contains(github.event.inputs.version, '-b') || contains(github.event.inputs.version, '-a') }}
           files: |
@@ -127,7 +127,7 @@ jobs:
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@v4
+        uses: mikepenz/release-changelog-builder-action@v5
         with:
           configuration: ".github/config/configuration.json"
           commitMode: true
@@ -136,7 +136,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Release
-        uses: softprops/action-gh-release@a485adba73bc95d9848c86e019d675bac99de0ed
+        uses: softprops/action-gh-release@9a28f2423fd7ba2781181bb13e8aba228027c4e9
         with:
           body: ${{steps.github_release.outputs.changelog}}
           prerelease: ${{ contains(github.event.inputs.version, '-rc') || contains(github.event.inputs.version, '-b') || contains(github.event.inputs.version, '-a') }}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 
 androidDriver = "2.0.2"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 compose = "1.6.10"
 
 koin = "3.5.6"
 koinCompose = "3.6.0-wasm-alpha2"
 koinComposeMultiplatform = "1.2.0-alpha3"
 
-gradle = "8.5.0"
+gradle = "8.5.2"
 sqlDelight = " 2.0.2"
 voyager = "1.0.0"
 multiplatformSettings = "1.1.1"
@@ -17,7 +17,7 @@ jna = "5.14.0"
 koalaplotCore = "0.5.4"
 kotlinxCoroutinesSwing = "1.8.1"
 kotlinxSerializationJson = "1.7.1"
-kotlinxDateTime = "0.6.0"
+kotlinxDateTime = "0.6.1"
 material3WindowSizeClassMultiplatform = "0.5.0"
 napier = "2.7.1"
 core-library-desugaring = "2.0.4"