chore: Merge branch dev to main (#104)

Author: LisoUseInAIKyrios

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        # microG RE bug report
+        # MicroG RE bug report
 
         Before creating a new bug report, please keep the following in mind:
 

.github/ISSUE_TEMPLATE/discussion.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        # microG RE Discussion
+        # MicroG RE Discussion
 
         Before creating a new discussion, please keep the following in mind:
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        # microG RE feature request
+        # MicroG RE feature request
 
         Before creating a new feature request, please keep the following in mind:
         

.github/workflows/crowdin_pull.yml

@@ -54,6 +54,11 @@ jobs:
           clean: true
 
       # Step 2: Compile Android app to check string resources
+      - name: "Setup Java"
+        uses: actions/setup-java@v5
+        with:
+          distribution: "temurin"
+          java-version: "18"
       - name: Compile Android app to check resources
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/crowdin_push.yml

@@ -16,8 +16,12 @@ jobs:
     name: Push strings
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v5
+      - name: Checkout dev
+        uses: actions/checkout@v6
+        with:
+          ref: dev
+          fetch-depth: 0
+          clean: true
 
       - name: Push strings
         uses: crowdin/github-action@v2

Images/Banner.svg

@@ -15,7 +15,7 @@ buildscript {
     ext.fragmentVersion = '1.8.9'
     ext.lifecycleVersion = '2.9.2'
     ext.loaderVersion = '1.1.0'
-    ext.materialVersion = '1.14.0-alpha05'
+    ext.materialVersion = '1.14.0-alpha08'
     ext.mediarouterVersion = '1.8.1'
     ext.multidexVersion = '2.0.1'
     ext.navigationVersion = '2.9.3'
@@ -33,7 +33,7 @@ buildscript {
     ext.wearableVersion = '0.1.1'
     ext.wireVersion = '5.3.10'
 
-    ext.androidBuildGradleVersion = '8.13.0'
+    ext.androidBuildGradleVersion = '8.13.2'
 
 //    ext.androidBuildVersionTools = '34.0.0'
 
@@ -83,10 +83,10 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.13
-    ext.appVersionCode = 253850000
+    ext.appVersionName = '6.0.0'
+    ext.appVersionCode = 254961000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
-    version = ext.appVersionName + " GMS-" + ext.baseVersion
+    version = ext.appVersionName
     ext.isReleaseVersion = false
 }
 

Images/Dark.png

@@ -4,22 +4,22 @@ api_token_env: "CROWDIN_PERSONAL_TOKEN"
 preserve_hierarchy: true
 
 files:
-  - source: '/play-services-base/core/src/main/res/values/strings.xml'
-    translation: '/play-services-base/core/src/main/values-%android_code%/values/strings.xml'
+  - source:      '/play-services-base/core/src/main/res/values/strings.xml'
+    translation: '/play-services-base/core/src/main/res/values-%android_code%/values/strings.xml'
     dest: '/microG/base.xml'
     skip_untranslated_strings: true
 
-  - source: '/play-services-core/src/main/res/values/plurals.xml'
+  - source:      '/play-services-core/src/main/res/values/plurals.xml'
     translation: '/play-services-core/src/main/res/values-%android_code%/plurals.xml'
     dest: '/microG/core_plurals.xml'
     skip_untranslated_strings: true
 
-  - source: '/play-services-core/src/main/res/values/strings.xml'
+  - source:      '/play-services-core/src/main/res/values/strings.xml'
     translation: '/play-services-core/src/main/res/values-%android_code%/strings.xml'
     dest: '/microG/core.xml'
     skip_untranslated_strings: true
 
-  - source: '/play-services-core/microg-ui-tools/src/main/res/values/strings.xml'
+  - source:      '/play-services-core/microg-ui-tools/src/main/res/values/strings.xml'
     translation: '/play-services-core/microg-ui-tools/src/main/res/values-%android_code%/strings.xml'
     dest: '/microG/core_ui.xml'
     skip_untranslated_strings: true