chore(release): 1.2.0 [skip ci]

# [1.2.0](https://github.com/revanced/revanced-patches/compare/v1.1.0...v1.2.0) (2022-06-11)

### Bug Fixes

* migrate to `include` annotation ([c53222c](c53222ce69))

### Features

* `microg-patch` ([21ae984](21ae984acb))
* updated all patches to support v17.22.36 of `com.android.google.youtube` ([285aac5](285aac5679))

.github/workflows/release.yml

@@ -28,12 +28,25 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
       - name: Make gradlew executable
         run: chmod +x gradlew
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean
+        run: ./gradlew build
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
+      - name: Generate Patches DEX
+        run: |
+          mkdir -p bin
+          fn=$(find build/libs -maxdepth 1 | grep -P "[\d]+\.jar")
+          out=bin/$(basename "$fn" | sed 's/jar/dex/g')
+          $ANDROID_HOME/build-tools/32.0.0/d8 $fn
+          mv *.dex $out
+      - name: Clean build
+        run: ./gradlew clean
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -26,6 +26,9 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
+          },
+          {
+            "path": "bin/*.dex"
           }
         ]
       }

CHANGELOG.md

@@ -1,3 +1,23 @@
+# [1.2.0](https://github.com/revanced/revanced-patches/compare/v1.1.0...v1.2.0) (2022-06-11)
+
+
+### Bug Fixes
+
+* migrate to `include` annotation ([110bbf1](https://github.com/revanced/revanced-patches/commit/110bbf143a9cec8dce1f0416cff40f8d93055e96))
+
+
+### Features
+
+* `microg-patch` ([48bbd57](https://github.com/revanced/revanced-patches/commit/48bbd574a52c8bf6834b26facfe7384b830f944a))
+* updated all patches to support v17.22.36 of `com.android.google.youtube` ([e12dc11](https://github.com/revanced/revanced-patches/commit/e12dc11b670c2b0c414741616e0a646e8421e418))
+
+# [1.1.0](https://github.com/revanced/revanced-patches/compare/v1.0.0...v1.1.0) (2022-06-11)
+
+
+### Features
+
+* generate & upload dex files ([#18](https://github.com/revanced/revanced-patches/issues/18)) ([e6f5355](https://github.com/revanced/revanced-patches/commit/e6f53553a98c164c4eb926fb273358ed506e00a4))
+
 # 1.0.0 (2022-06-05)
 
 

build.gradle.kts

@@ -25,7 +25,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
 
-    implementation("app.revanced:revanced-patcher:1.0.0")
+    implementation("app.revanced:revanced-patcher:1.1.0")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
 }
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0
+version = 1.2.0

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -19,17 +19,17 @@ internal fun Node.doRecursively(action: (Node) -> Unit) {
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-internal fun String.startsWithAny(vararg prefix: String): Boolean {
+internal fun String.startsWithAny(vararg prefixes: String): Boolean {
-    for (_prefix in prefix)
+    for (prefix in prefixes)
-        if (this.startsWith(_prefix))
+        if (this.startsWith(prefix))
             return true
 
     return false
 }
 
-internal fun String.containsAny(vararg others: String): Boolean {
+internal fun String.equalsAny(vararg other: String): Boolean {
-    for (other in others)
+    for (_other in other)
-        if (this.contains(other))
+        if (this == _other)
             return true
 
     return false

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -20,7 +20,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
 @Name("upgrade-button-remover")
-@Description("Remove the upgrade tab from t he pivot bar in YouTube music.")
+@Description("Remove the upgrade tab from the pivot bar in YouTube music.")
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt

@@ -43,7 +43,7 @@ import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 @Dependencies(
     dependencies = [ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, GeneralResourceAdsPatch::class]
 )
-@Name("general-bytecode-ads")
+@Name("general-ads")
 @Description("Patch to remove general ads in bytecode.")
 @GeneralAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -1,24 +1,22 @@
 package app.revanced.patches.youtube.misc.microg.patch.bytecode
 
-import app.revanced.extensions.containsAny
+import app.revanced.extensions.equalsAny
-import app.revanced.extensions.startsWithAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.data.implementation.proxy
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
 import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
@@ -26,7 +24,6 @@ import app.revanced.patches.youtube.misc.microg.signatures.GooglePlayUtilitySign
 import app.revanced.patches.youtube.misc.microg.signatures.IntegrityCheckSignature
 import app.revanced.patches.youtube.misc.microg.signatures.PrimeSignature
 import app.revanced.patches.youtube.misc.microg.signatures.ServiceCheckSignature
-import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
@@ -34,8 +31,9 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 
-// @Patch TODO: finish patch
+@Patch(include = false)
-@Name("microg-bytecode-patch")
+@Dependencies(dependencies = [MicroGResourcePatch::class])
+@Name("microg-patch")
 @Description("Patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
@@ -59,30 +57,33 @@ class MicroGBytecodePatch : BytecodePatch(
 
                     val stringValue = ((instruction as Instruction21c).reference as StringReference).string
 
-                    val replaceMode =
+                    val replaceMode = if (stringValue.equalsAny(
-                        if (stringValue == "com.google" || stringValue == "com.google.android.gms" ||
+                            "com.google.android.gms",
-                            stringValue.startsWithAny(
+                            "com.google.android.youtube.fileprovider",
-                                "com.google.iid",
+                            "com.google.android.c2dm.intent.REGISTER",
-                                "com.google.android.gms.chimera",
+                            "com.google.android.c2dm.permission.SEND",
-                                "com.google.android.c2dm",
+                            "com.google.iid.TOKEN_REQUEST",
-                            ) || stringValue.containsAny(
+                            "com.google",
-                                "com.google.android.gms.auth.accounts",
+                            "com.google.android.gms.auth.accounts",
-                                "com.google.android.gsf",
+                            "com.google.android.youtube.SuggestionProvider",
-                                "content://com.google.settings"
+                            "com.google.android.c2dm.intent.REGISTRATION",
-                            )
+                            "com.google.android.gsf.action.GET_GLS",
-                        ) {
+                            "com.google.android.gsf.login",
-                            StringReplaceMode.REPLACE_WITH_MICROG
+                            "content://com.google.settings/partner",
-                        } else if (stringValue.startsWith("com.google.android.gms.chimera.container")) // https://github.com/TeamVanced/VancedMicroG/pull/139/file
+                            "content://com.google.android.gsf.gservices",
-                            StringReplaceMode.DO_NOT_REPLACE
+                            "content://com.google.android.gsf.gservices/prefix",
-                        else if (stringValue.startsWithAny(
+                            "com.google.android.c2dm.intent.RECEIVE"
-                                "com.google.android.youtube.SuggestionsProvider",
+                        )
-                                "com.google.android.youtube.fileprovider"
+                    ) {
-                            )
+                        StringReplaceMode.REPLACE_WITH_MICROG
-                        ) {
+                    } else if (stringValue.equalsAny(
-                            StringReplaceMode.REPLACE_WITH_REVANCED
+                            "com.google.android.youtube.SuggestionsProvider", "com.google.android.youtube.fileprovider"
-                        } else {
+                        )
-                            StringReplaceMode.DO_NOT_REPLACE
+                    ) {
-                        }
+                        StringReplaceMode.REPLACE_WITH_REVANCED
+                    } else {
+                        StringReplaceMode.DO_NOT_REPLACE
+                    }
 
                     if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
                         if (proxiedClass == null) {
@@ -110,20 +111,6 @@ class MicroGBytecodePatch : BytecodePatch(
             }
         }
 
-
-        // replace string back
-        val implementation =
-            signatures.elementAt(2).result!!.findParentMethod(@Name("do-not-replace-method") @MatchingMethod(
-                "Llpe;", "c"
-            ) @DirectPatternScanMethod @MicroGPatchCompatibility @Version("0.0.1") object : MethodSignature(
-                "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null, listOf("com.google.android.gms")
-            ) {})!!.method.implementation!!
-
-        implementation.replaceInstruction(
-            implementation.instructions.indexOfFirst { it.opcode == Opcode.CONST_STRING },
-            "const-string v0, \"com.google.android.gms\"".toInstruction()
-        )
-
         return PatchResultSuccess()
     }
 

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -9,61 +9,53 @@ import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
 
-// @Patch TODO: finish patch
 @Name("microg-resource-patch")
 @Description("Resource patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
 class MicroGResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
+        data.getXmlEditor("res/xml/settings_fragment.xml").use {
+            val settingsElementIntent = it.file.createElement("intent")
+            settingsElementIntent.setAttribute("android:targetPackage", "$BASE_MICROG_PACKAGE_NAME.android.gms")
+            settingsElementIntent.setAttribute("android:targetClass", "org.microg.gms.ui.SettingsActivity")
+
+            val settingsElement = it.file.createElement("Preference")
+            settingsElement.setAttribute("android:title", "MicroG")
+            settingsElement.appendChild(settingsElementIntent)
+
+            it.file.firstChild.appendChild(settingsElement)
+        }
+
         val manifest = data.get("AndroidManifest.xml").readText()
 
         data.get("AndroidManifest.xml").writeText(
             manifest.replace(
-                "package=\"com.google.android.youtube\"", "package=\"$REVANCED_PACKAGE_NAME\""
+                "package=\"com.google.android.youtube", "package=\"$REVANCED_PACKAGE_NAME"
             ).replace(
-                " android:label=\"@string/application_name\" ", " android:label=\"{APP_NAME}\" "
+                "android:label=\"@string/application_name", "android:label=\"$REVANCED_APP_NAME"
             ).replace(
-                "<uses-permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
+                "android:authorities=\"com.google.android.youtube", "android:authorities=\"$REVANCED_PACKAGE_NAME"
-                "<uses-permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
             ).replace(
-                "<permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
-                "<permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
-            ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.lifecycle-trojan\"",
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.lifecycle-trojan\""
-            ).replace(
-                "\"com.google.android.youtube.fileprovider\"", "\"$REVANCED_PACKAGE_NAME.fileprovider\""
-            ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.photopicker_images\"",
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.photopicker_images\""
-            ).replace("com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm").replace(
-                "    </queries>",
-                "        <package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/>\n    </queries>"
-            )
-        )
-
-        val replacement = arrayOf(
-            Pair(
-                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
-            ), Pair(
                 "com.google.android.youtube.fileprovider", "$REVANCED_PACKAGE_NAME.fileprovider"
+            ).replace(
+                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
+            ).replace(
+                "com.google.android.youtube.permission.C2D_MESSAGE", "$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE"
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.lifecycle-trojan", "$REVANCED_PACKAGE_NAME.lifecycle-trojan"
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.photopicker_images", "$REVANCED_PACKAGE_NAME.photopicker_images"
+            ).replace(
+                "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
+            ).replace(
+                "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
             )
         )
 
-        data.forEach {
-            if (it.extension != "xml") return@forEach
-
-            // TODO: use a reader and only replace strings where needed instead of reading & writing the entire file
-            var content = it.readText()
-            replacement.filter { translation -> content.contains(translation.first) }.forEach { translation ->
-                content = content.replace(translation.first, translation.second)
-            }
-            it.writeText(content)
-        }
-
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt

@@ -3,4 +3,5 @@ package app.revanced.patches.youtube.misc.microg.shared
 object Constants {
     internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
     internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
+    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
 }