chore: Merge branch dev to main (#62)

.github/workflows/release.yml

@@ -10,6 +10,9 @@ on:
 jobs:
   release:
     name: Release
+    permissions:
+      contents: write
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -49,5 +52,5 @@ jobs:
 
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm exec semantic-release

.releaserc

@@ -23,7 +23,8 @@
         "assets": [
           "CHANGELOG.md",
           "gradle.properties"
-        ]
+        ],
+        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
     ],
     [

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [3.0.1-dev.3](https://github.com/ReVanced/revanced-library/compare/v3.0.1-dev.2...v3.0.1-dev.3) (2024-10-06)
+
+## [3.0.1-dev.2](https://github.com/ReVanced/revanced-library/compare/v3.0.1-dev.1...v3.0.1-dev.2) (2024-10-01)
+
+## [3.0.1-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.0...v3.0.1-dev.1) (2024-08-16)
+
+
+### Bug Fixes
+
+* Serialize compatible packages as a map instead of a set of pairs. ([737e272](https://github.com/ReVanced/revanced-library/commit/737e272481fe3b0b4c89233d139b5e657a0c1de4))
+
 # [3.0.0](https://github.com/ReVanced/revanced-library/compare/v2.3.0...v3.0.0) (2024-08-06)
 
 

build.gradle.kts

@@ -54,7 +54,7 @@ kotlin {
         commonMain.dependencies {
             implementation(libs.apksig)
             implementation(libs.apkzlib)
-            implementation(libs.bcpkix.jdk15on)
+            implementation(libs.bcpkix.jdk18on)
             implementation(libs.guava)
             implementation(libs.jadb)
             implementation(libs.kotlin.reflect)

gradle.properties

@@ -1,4 +1,4 @@
-version = 3.0.0
+version = 3.0.1-dev.3
 #Gradle
 org.gradle.jvmargs = -Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options="-Xmx2048M"
 org.gradle.caching = true

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
 android = "8.5.1"
-bcpkix-jdk15on = "1.70"
+bcpkix-jdk18on = "1.77"
 binary-compatibility-validator = "0.15.1"
 core-ktx = "1.13.1"
 guava = "33.0.0-jre"
 jadb = "1.2.1"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.7.1"
 libsu = "5.2.2"
@@ -14,7 +14,7 @@ revanced-patcher = "20.0.0"
 [libraries]
 apkzlib = { module = "com.android.tools.build:apkzlib", version.ref = "android" }
 apksig = { module = "com.android.tools.build:apksig", version.ref = "android" }
-bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkix-jdk15on" }
+bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkix-jdk18on" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 jadb = { module = "app.revanced:jadb", version.ref = "jadb" } # Fork with Shell v2 support.

package.json

@@ -3,7 +3,7 @@
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.2"
+    "gradle-semantic-release-plugin": "^1.10.1",
+    "semantic-release": "^24.1.2"
   }
 }

src/commonMain/kotlin/app/revanced/library/Serialization.kt

@@ -1,14 +1,19 @@
 package app.revanced.library
 
-import app.revanced.patcher.patch.*
-import kotlinx.serialization.*
+import app.revanced.patcher.patch.Option
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.VersionName
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.descriptors.element
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.encoding.encodeStructure
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToStream
+import kotlinx.serialization.serializer
 import java.io.OutputStream
 
 private class PatchSerializer : KSerializer<Patch<*>> {
@@ -17,7 +22,7 @@ private class PatchSerializer : KSerializer<Patch<*>> {
         element<String?>("description")
         element<Boolean>("use")
         element<List<String>>("dependencies")
-        element<Set<Package>?>("compatiblePackages")
+        element<Map<PackageName, Set<VersionName>?>?>("compatiblePackages")
         element("options", OptionSerializer.descriptor)
     }
 
@@ -52,8 +57,8 @@ private class PatchSerializer : KSerializer<Patch<*>> {
             encodeNullableSerializableElement(
                 descriptor,
                 4,
-                SetSerializer(PairSerializer(String.serializer(), SetSerializer(String.serializer()).nullable)),
-                value.compatiblePackages,
+                MapSerializer(String.serializer(), SetSerializer(String.serializer()).nullable),
+                value.compatiblePackages?.associate { (packageName, versions) -> packageName to versions },
             )
             encodeSerializableElement(
                 descriptor,

src/commonTest/kotlin/app/revanced/library/SerializationTest.kt

@@ -1,6 +1,9 @@
 package app.revanced.library
 
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.booleanOption
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.patch.floatsOption
+import app.revanced.patcher.patch.stringOption
 import kotlinx.serialization.json.*
 import java.io.ByteArrayOutputStream
 import kotlin.test.Test
@@ -33,7 +36,7 @@ class SerializationTest {
 
         assert(deserializedPatch["name"]!!.jsonPrimitive.content == "Test patch")
 
-        assert(deserializedPatch["compatiblePackages"]!!.jsonArray.size == 2) {
+        assert(deserializedPatch["compatiblePackages"]!!.jsonObject.size == 2) {
             "The patch should be compatible with two packages."
         }