Merge branch 'release/v1.2.4'

mshdabiola · Dec 16, 2024 · 8616f57 · 8616f57
2 parents 7b7b371 + 8976df4
commit 8616f57
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -3,7 +3,7 @@ name: Web CI
 on:
   push:
     tags:
-      - 'w[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:

diff --git a/app/dependencies/googlePlayDebugRuntimeClasspath.txt b/app/dependencies/googlePlayDebugRuntimeClasspath.txt
@@ -15,14 +15,14 @@ androidx.cardview:cardview:1.0.0
 androidx.collection:collection-jvm:1.4.4
 androidx.collection:collection-ktx:1.4.4
 androidx.collection:collection:1.4.4
-androidx.compose.animation:animation-android:1.7.5
-androidx.compose.animation:animation-core-android:1.7.5
-androidx.compose.animation:animation-core:1.7.5
-androidx.compose.animation:animation:1.7.5
-androidx.compose.foundation:foundation-android:1.7.5
-androidx.compose.foundation:foundation-layout-android:1.7.5
-androidx.compose.foundation:foundation-layout:1.7.5
-androidx.compose.foundation:foundation:1.7.5
+androidx.compose.animation:animation-android:1.7.6
+androidx.compose.animation:animation-core-android:1.7.6
+androidx.compose.animation:animation-core:1.7.6
+androidx.compose.animation:animation:1.7.6
+androidx.compose.foundation:foundation-android:1.7.6
+androidx.compose.foundation:foundation-layout-android:1.7.6
+androidx.compose.foundation:foundation-layout:1.7.6
+androidx.compose.foundation:foundation:1.7.6
 androidx.compose.material3.adaptive:adaptive-android:1.0.0
 androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0
 androidx.compose.material3.adaptive:adaptive-layout:1.0.0
@@ -41,30 +41,30 @@ androidx.compose.material:material-icons-extended:1.7.5
 androidx.compose.material:material-ripple-android:1.7.5
 androidx.compose.material:material-ripple:1.7.5
 androidx.compose.material:material:1.7.5
-androidx.compose.runtime:runtime-android:1.7.5
-androidx.compose.runtime:runtime-saveable-android:1.7.5
-androidx.compose.runtime:runtime-saveable:1.7.5
-androidx.compose.runtime:runtime:1.7.5
-androidx.compose.ui:ui-android:1.7.5
-androidx.compose.ui:ui-geometry-android:1.7.5
-androidx.compose.ui:ui-geometry:1.7.5
-androidx.compose.ui:ui-graphics-android:1.7.5
-androidx.compose.ui:ui-graphics:1.7.5
-androidx.compose.ui:ui-test-manifest:1.7.5
-androidx.compose.ui:ui-text-android:1.7.5
-androidx.compose.ui:ui-text-google-fonts:1.7.5
-androidx.compose.ui:ui-text:1.7.5
-androidx.compose.ui:ui-tooling-android:1.7.5
-androidx.compose.ui:ui-tooling-data-android:1.7.5
-androidx.compose.ui:ui-tooling-data:1.7.5
-androidx.compose.ui:ui-tooling-preview-android:1.7.5
-androidx.compose.ui:ui-tooling-preview:1.7.5
-androidx.compose.ui:ui-tooling:1.7.5
-androidx.compose.ui:ui-unit-android:1.7.5
-androidx.compose.ui:ui-unit:1.7.5
-androidx.compose.ui:ui-util-android:1.7.5
-androidx.compose.ui:ui-util:1.7.5
-androidx.compose.ui:ui:1.7.5
+androidx.compose.runtime:runtime-android:1.7.6
+androidx.compose.runtime:runtime-saveable-android:1.7.6
+androidx.compose.runtime:runtime-saveable:1.7.6
+androidx.compose.runtime:runtime:1.7.6
+androidx.compose.ui:ui-android:1.7.6
+androidx.compose.ui:ui-geometry-android:1.7.6
+androidx.compose.ui:ui-geometry:1.7.6
+androidx.compose.ui:ui-graphics-android:1.7.6
+androidx.compose.ui:ui-graphics:1.7.6
+androidx.compose.ui:ui-test-manifest:1.7.6
+androidx.compose.ui:ui-text-android:1.7.6
+androidx.compose.ui:ui-text-google-fonts:1.7.6
+androidx.compose.ui:ui-text:1.7.6
+androidx.compose.ui:ui-tooling-android:1.7.6
+androidx.compose.ui:ui-tooling-data-android:1.7.6
+androidx.compose.ui:ui-tooling-data:1.7.6
+androidx.compose.ui:ui-tooling-preview-android:1.7.6
+androidx.compose.ui:ui-tooling-preview:1.7.6
+androidx.compose.ui:ui-tooling:1.7.6
+androidx.compose.ui:ui-unit-android:1.7.6
+androidx.compose.ui:ui-unit:1.7.6
+androidx.compose.ui:ui-util-android:1.7.6
+androidx.compose.ui:ui-util:1.7.6
+androidx.compose.ui:ui:1.7.6
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.constraintlayout:constraintlayout-solver:1.1.3
 androidx.constraintlayout:constraintlayout:1.1.3

diff --git a/app/fossReliantRelease-badging.txt b/app/fossReliantRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='com.mshdabiola.skeletonapp.foss' versionCode='123' versionName='1.2.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+package: name='com.mshdabiola.skeletonapp.foss' versionCode='124' versionName='1.2.4' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'24'
 targetSdkVersion:'35'
 uses-permission: name='com.mshdabiola.skeletonapp.foss.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'

diff --git a/app/src/jvmMain/kotlin/com/mshdabiola/skeletonapp/MainApp.kt b/app/src/jvmMain/kotlin/com/mshdabiola/skeletonapp/MainApp.kt
@@ -36,7 +36,7 @@ fun mainApp() {
             position = WindowPosition.Aligned(Alignment.Center),
         )
 
-        val version = "1.2.3"
+        val version = "1.2.4"
         Window(
             onCloseRequest = ::exitApplication,
             title = "$appName v$version",

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -57,7 +57,7 @@ kstore ="0.9.1"
 compose-plugin = "1.7.1"
 composeNavigation="2.8.0-alpha10"
 androidxNavigationTest = "2.8.5" #for nav test
-compose = "1.7.5"
+compose = "1.7.6"
 
 
 playGame = "20.1.2"
@@ -92,8 +92,8 @@ kover = "0.9.0"
 series = "0.0.19"
 calf = "0.6.1"
 
-versionCode = "123"
-versionName = "1.2.3"
+versionCode = "124"
+versionName = "1.2.4"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Web CI @@
     on:
       push:
         tags:
-          - 'w[0-9]+.[0-9]+.[0-9]+'
+          - 'v[0-9]+.[0-9]+.[0-9]+'
     jobs:
       build:
@@ Expand Down @@