Merge branch 'develop' into 3288-Update-Left/Right-margin-and-padding…

…s-with-Start/End
Oztechan · Apr 3, 2024 · 4e49bc8 · 4e49bc8
2 parents 15cc7f2 + a103e80
commit 4e49bc8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -112,7 +112,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   DistributeAndroid:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GradleBuild ]
     if: github.event_name == 'push'
     outputs:
@@ -212,7 +212,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   DistributeIOS:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ XCodeBuild ]
     if: github.event_name == 'push'
     outputs:
@@ -281,7 +281,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadQualityReports:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ Quality ]
     outputs:
       status: ${{ steps.status.outputs.status }}
@@ -329,7 +329,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   CodeAnalysis:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -366,7 +366,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   Notify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GradleBuild, XCodeBuild, Quality, CodeAnalysis, DistributeAndroid, DistributeIOS, UploadQualityReports ]
     if: always()
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ env:
 jobs:
 
   GenerateGradleArtifacts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -112,7 +112,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToGooglePlay:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GenerateGradleArtifacts ]
     outputs:
       status: ${{ steps.status.outputs.status }}
@@ -148,7 +148,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToHuaweiAppGallery:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GenerateGradleArtifacts ]
     outputs:
       status: ${{ steps.status.outputs.status }}
@@ -180,7 +180,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   DeployToServer:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GenerateGradleArtifacts ]
     outputs:
       status: ${{ steps.status.outputs.status }}
@@ -246,7 +246,7 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   Notify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ GenerateGradleArtifacts, UploadToGooglePlay, UploadToHuaweiAppGallery, DeployToServer, UploadToAppStore ]
     if: always()
     steps:

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ ksp = "1.9.23-1.0.19"
 detekt = "1.23.6"
 androidGradlePlugin = "8.2.2"
 composeCompiler = "1.5.11"
-compose = "1.6.3"
+compose = "1.6.5"
 glance = "1.0.0"
 material3 = "1.2.1"
 androidDesugaring = "2.0.4"

diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
@@ -10,16 +10,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.899.0)
-    aws-sdk-core (3.191.4)
+    aws-partitions (1.904.0)
+    aws-sdk-core (3.191.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.78.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.0)
+    aws-sdk-s3 (1.146.1)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

diff --git a/submodule/basemob b/submodule/basemob
diff --git a/submodule/logmob b/submodule/logmob
diff --git a/submodule/parsermob b/submodule/parsermob
diff --git a/submodule/scopemob b/submodule/scopemob
+1 −1		.github/workflows/main.yml
+1 −1		.github/workflows/release.yml