chore(release): 1.2.1 [skip ci]

## [1.2.1](https://github.com/revanced/revanced-patcher/compare/v1.2.0...v1.2.1) (2022-06-14)

### Bug Fixes

* Patcher setting BuildOptions too late ([6a5c873](6a5c8735fb))

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.2.1](https://github.com/revanced/revanced-patcher/compare/v1.2.0...v1.2.1) (2022-06-14)
+
+
+### Bug Fixes
+
+* Patcher setting BuildOptions too late ([6a5c873](https://github.com/revanced/revanced-patcher/commit/6a5c8735fb8a5d6f7e9c606734b6684c7fa99e7f))
+
+# [1.2.0](https://github.com/revanced/revanced-patcher/compare/v1.1.0...v1.2.0) (2022-06-14)
+
+
+### Features
+
+* allow custom framework path to be specified ([d3a580e](https://github.com/revanced/revanced-patcher/commit/d3a580ea19d7c2d5d8c97650b1e6396ea0a7fc25))
+
 # [1.1.0](https://github.com/revanced/revanced-patcher/compare/v1.0.0...v1.1.0) (2022-06-11)
 
 

build.gradle.kts

@@ -1,24 +1,21 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.0"
     java
     `maven-publish`
 }
 
 group = "app.revanced"
 
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
     maven {
         url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
         credentials {
-            // DO NOT set these variables in the project's gradle.properties.
-            // Instead, you should set them in:
-            // Windows: %homepath%\.gradle\gradle.properties
-            // Linux: ~/.gradle/gradle.properties
-            username =
-                project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password =
-                project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
+            username = githubUsername
+            password = githubPassword
         }
     }
 }
@@ -32,8 +29,7 @@ dependencies {
     api("org.smali:smali:2.5.2")
 
     testImplementation(kotlin("test"))
-    implementation(kotlin("reflect"))
-}
+    implementation(kotlin("reflect"))}
 
 tasks {
     test {
@@ -49,11 +45,8 @@ java {
     withJavadocJar()
 }
 
-val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
-
 publishing {
     repositories {
-        if (isGitHubCI) {
             maven {
                 name = "GitHubPackages"
                 url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
@@ -62,9 +55,6 @@ publishing {
                     password = System.getenv("GITHUB_TOKEN")
                 }
             }
-        } else {
-            mavenLocal()
-        }
     }
     publications {
         register<MavenPublication>("gpr") {

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.1.0
+version = 1.2.1

src/main/kotlin/app/revanced/patcher/Patcher.kt

@@ -51,7 +51,10 @@ class Patcher(private val options: PatcherOptions) {
         if (outDir.exists()) outDir.deleteRecursively()
         outDir.mkdirs()
 
-        val androlib = Androlib()
+        val androlib = Androlib(BuildOptions().also { buildOptions ->
+            buildOptions.aaptPath = options.aaptPath
+            buildOptions.frameworkFolderLocation = options.frameworkFolderLocation
+        })
         val resourceTable = androlib.getResTable(extInputFile, true)
 
         val packageMetadata = PackageMetadata()
@@ -144,6 +147,7 @@ class Patcher(private val options: PatcherOptions) {
             val androlibResources = AndrolibResources().also { resources ->
                 resources.buildOptions = BuildOptions().also { buildOptions ->
                     buildOptions.aaptPath = options.aaptPath
+                    buildOptions.frameworkFolderLocation = options.frameworkFolderLocation
                     buildOptions.isFramework = metaInfo.isFrameworkApk
                     buildOptions.resourcesAreCompressed = metaInfo.compressionType
                     buildOptions.doNotCompress = metaInfo.doNotCompress

src/main/kotlin/app/revanced/patcher/PatcherOptions.kt

@@ -8,10 +8,12 @@ import java.io.File
  * @param resourceCacheDirectory Directory to cache resources.
  * @param patchResources Weather to use the resource patcher. Resources will still need to be decoded.
  * @param aaptPath Optional path to a custom aapt binary.
+ * @param frameworkFolderLocation Optional path to a custom framework folder.
  */
 data class PatcherOptions(
     internal val inputFile: File,
     internal val resourceCacheDirectory: String,
     internal val patchResources: Boolean = false,
-    internal val aaptPath: String = ""
+    internal val aaptPath: String = "",
+    internal val frameworkFolderLocation: String? = null
 )