Test

DerTyp7214 · Feb 24, 2023 · c07fc29 · c07fc29
1 parent 5434f03
commit c07fc29
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 48 deletions.
diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
@@ -26,16 +26,16 @@ jobs:
 
       - name: Get Commit Message
         id: commitMessage
-        run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
+        run: IN="${{ github.event.head_commit.message }}" && echo "message=${IN%%$'\n'*}" >> $GITHUB_OUTPUT
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         if: ${{ false }}
         with:
           path: |
@@ -46,7 +46,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -56,7 +56,7 @@ jobs:
 
       - name: Extract branch name
         shell: bash
-        run: echo "::set-output name=BRANCH_NAME::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')" >> $GITHUB_OUTPUT
         id: extract_branch
 
       - name: File Permissions
@@ -67,19 +67,15 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           gradle-version: wrapper
           arguments: assembleDebug
 
       - name: Get JSON
         id: metadataJson
         run: |
-          content=`cat app/build/outputs/apk/debug/output-metadata.json`
-          content="${content//'%'/'%25'}"
-          content="${content//$'\n'/'%0A'}"
-          content="${content//$'\r'/'%0D'}"
-          echo "::set-output name=json::$content"
+          echo "json=$(cat app/build/outputs/apk/debug/output-metadata.json | jq -c .)" >> $GITHUB_OUTPUT
 
       - name: Sign artifact
         id: signArtifact
@@ -157,13 +153,13 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         if: ${{ false }}
         with:
           path: |
@@ -174,7 +170,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -195,7 +191,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           gradle-version: wrapper
           arguments: assembleRelease
@@ -287,13 +283,13 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         if: ${{ false }}
         with:
           path: |
@@ -304,7 +300,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -325,7 +321,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           gradle-version: wrapper
           arguments: assembleDebug

diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
@@ -22,13 +22,13 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ~/.gradle/caches
@@ -54,7 +54,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           gradle-version: wrapper
           arguments: assemblePro

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
@@ -19,13 +19,13 @@ jobs:
           ndk-version: r25b
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ~/.gradle/caches
@@ -35,7 +35,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.2.4
+        uses: actions/cache@v3.2.6
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -51,7 +51,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           gradle-version: wrapper
           wrapper-cache-enabled: true

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
 val libsuVersion = "5.0.4"
 val kotlinVersion: String = project.getKotlinPluginVersion()
 
-@Suppress("UnstableApiUsage")
 android {
     compileSdkPreview = "UpsideDownCake"
     buildToolsVersion = "34.0.0-rc1"
@@ -24,7 +23,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 23
         targetSdk = 33
-        versionCode = 376200
+        versionCode = 376300
         versionName = "3.7.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -86,26 +85,26 @@ dependencies {
 
     implementation("com.github.DerTyp7214:PreferencesPlus:1.0")
 
-    implementation("com.google.protobuf:protobuf-kotlin:3.21.12")
+    implementation("com.google.protobuf:protobuf-kotlin:3.22.0")
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0-alpha05")
-    implementation("androidx.navigation:navigation-ui-ktx:2.6.0-alpha05")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0-alpha06")
+    implementation("androidx.navigation:navigation-ui-ktx:2.6.0-alpha06")
     implementation("org.apache.commons:commons-text:1.10.0")
 
     implementation("com.github.topjohnwu.libsu:core:$libsuVersion")
     implementation("com.github.topjohnwu.libsu:io:$libsuVersion")
     implementation("com.github.topjohnwu.libsu:nio:$libsuVersion")
     implementation("dev.chrisbanes.insetter:insetter:0.6.1")
-    implementation("androidx.core:core-ktx:1.10.0-alpha02")
+    implementation("androidx.core:core-ktx:1.10.0-beta01")
     //noinspection DifferentStdlibGradleVersion
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.20-Beta")
-    implementation("androidx.core:core:1.10.0-alpha02")
-    implementation("com.google.android.material:material:1.9.0-alpha01")
+    implementation("androidx.core:core:1.10.0-beta01")
+    implementation("com.google.android.material:material:1.9.0-alpha02")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha07")
     implementation("androidx.preference:preference-ktx:1.2.0")
     implementation("androidx.activity:activity-ktx:1.8.0-alpha01")
-    implementation("androidx.fragment:fragment-ktx:1.6.0-alpha05")
+    implementation("androidx.fragment:fragment-ktx:1.6.0-alpha06")
     implementation("com.jaredrummler:android-shell:1.0.0")
     implementation("com.google.firebase:firebase-analytics:21.2.0")
     implementation("com.google.firebase:firebase-messaging:23.1.1")
@@ -123,6 +122,6 @@ dependencies {
     implementation("com.github.murgupluoglu:flagkit-android:1.0.2")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-beta01")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-beta02")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20-Beta")
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/proto/ThemePackList.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/proto/ThemePackList.kt
@@ -680,8 +680,8 @@ object ThemePackList {
         private constructor() {
             url_ = ""
             author_ = ""
-            tags_ = LazyStringArrayList.EMPTY
-            themes_ = LazyStringArrayList.EMPTY
+            tags_ = LazyStringArrayList.emptyList()
+            themes_ = LazyStringArrayList.emptyList()
             name_ = ""
             description_ = ""
         }
@@ -1226,9 +1226,9 @@ object ThemePackList {
                 super.clear()
                 url_ = ""
                 author_ = ""
-                tags_ = LazyStringArrayList.EMPTY
+                tags_ = LazyStringArrayList.emptyList()
                 bitField0_ = (bitField0_ and 0x00000001.inv())
-                themes_ = LazyStringArrayList.EMPTY
+                themes_ = LazyStringArrayList.emptyList()
                 bitField0_ = (bitField0_ and 0x00000002.inv())
                 size_ = 0L
                 date_ = 0L
@@ -1261,12 +1261,12 @@ object ThemePackList {
                 result.url_ = url_
                 result.author_ = author_
                 if (((bitField0_ and 0x00000001) != 0)) {
-                    tags_ = tags_!!.unmodifiableView
+                    tags_ = LazyStringArrayList(tags_!!.unmodifiableView)
                     bitField0_ = (bitField0_ and 0x00000001.inv())
                 }
                 result.tags_ = tags_
                 if (((bitField0_ and 0x00000002) != 0)) {
-                    themes_ = themes_!!.unmodifiableView
+                    themes_ = LazyStringArrayList(themes_!!.unmodifiableView)
                     bitField0_ = (bitField0_ and 0x00000002.inv())
                 }
                 result.themes_ = themes_
@@ -1340,7 +1340,7 @@ object ThemePackList {
                 }
                 if (other.tags_!!.isNotEmpty()) {
                     if (tags_!!.isEmpty()) {
-                        tags_ = other.tags_
+                        tags_ = LazyStringArrayList(other.tags_)
                         bitField0_ = (bitField0_ and 0x00000001.inv())
                     } else {
                         ensureTagsIsMutable()
@@ -1350,7 +1350,7 @@ object ThemePackList {
                 }
                 if (other.themes_!!.isNotEmpty()) {
                     if (themes_!!.isEmpty()) {
-                        themes_ = other.themes_
+                        themes_ = LazyStringArrayList(other.themes_)
                         bitField0_ = (bitField0_ and 0x00000002.inv())
                     } else {
                         ensureThemesIsMutable()
@@ -1474,7 +1474,7 @@ object ThemePackList {
                 }
             }
 
-            private var tags_ = LazyStringArrayList.EMPTY
+            private var tags_ = LazyStringArrayList.emptyList()
             private fun ensureTagsIsMutable() {
                 if ((bitField0_ and 0x00000001) == 0) {
                     tags_ = LazyStringArrayList(tags_)
@@ -1520,7 +1520,7 @@ object ThemePackList {
                 return tags_!!.getByteString(index)
             }
 
-            private var themes_ = LazyStringArrayList.EMPTY
+            private var themes_ = LazyStringArrayList.emptyList()
             private fun ensureThemesIsMutable() {
                 if ((bitField0_ and 0x00000002) == 0) {
                     themes_ = LazyStringArrayList(themes_)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ buildscript {
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.0-alpha05")
+        classpath("com.android.tools.build:gradle:8.1.0-alpha06")
         //noinspection DifferentKotlinGradleVersion
         classpath(kotlin("gradle-plugin", version = "1.8.20-Beta"))
         classpath("com.google.gms:google-services:4.3.15")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 28 17:49:00 CEST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.1-20230216231204+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.1-20230223232044+0000-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists