From 6fd81770bf290acb2cf966057d765819487a0936 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:48:13 +0100 Subject: [PATCH 1/6] chore: rename root project name Signed-off-by: oSumAtrIX --- settings.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9b3c09a0..7743d887 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,4 +8,5 @@ dependencyResolutionManagement { } include(":app") include(":dummy") -rootProject.name = "integrations" + +rootProject.name = "revanced-integrations" From 89f866d739a7a1868b29ad6695f92e6f91b600f5 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:48:51 +0100 Subject: [PATCH 2/6] refactor: remove workaround task `publish` Signed-off-by: oSumAtrIX --- build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 08d8a748..5bc4f6b3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,12 +13,6 @@ buildscript { } } -// Tracking issue https://github.com/semantic-release/semantic-release/issues/963 -tasks.register("publish", DefaultTask::class) { - group = "publish" - description = "Dummy publish to pass the verification phase of the gradle-semantic-release-plugin" -} - tasks.register("clean", Delete::class) { delete(rootProject.buildDir) } From 993aadd4df80159de8497caa729b828726614ff6 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:49:09 +0100 Subject: [PATCH 3/6] chore: update sdk versions Signed-off-by: oSumAtrIX --- dummy/build.gradle.kts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dummy/build.gradle.kts b/dummy/build.gradle.kts index 0e98cdad..60bab807 100644 --- a/dummy/build.gradle.kts +++ b/dummy/build.gradle.kts @@ -4,11 +4,12 @@ plugins { android { namespace = "app.revanced.dummy" - compileSdk = 32 + compileSdk = 33 + buildToolsVersion = "33.0.1" defaultConfig { - minSdk = 26 - targetSdk = 32 + minSdk = 23 + targetSdk = 33 } buildTypes { @@ -24,7 +25,4 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } -} - -dependencies { } \ No newline at end of file From 8de014583ed6ee70c5d878ffc8f58cb34ec2fed9 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:49:43 +0100 Subject: [PATCH 4/6] chore: bump build tools version Signed-off-by: oSumAtrIX --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 12d7dcdc..07d94780 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,7 @@ plugins { android { compileSdk = 33 - buildToolsVersion = "33.0.0" + buildToolsVersion = "33.0.1" namespace = "app.revanced.integrations" defaultConfig { From 4a3d20e1f0b2c63c0f1837dcd6408ab5d927fdba Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:50:05 +0100 Subject: [PATCH 5/6] chore: set `versionName` Signed-off-by: oSumAtrIX --- app/build.gradle.kts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 07d94780..f07e39f1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,16 +15,8 @@ android { applicationId = "app.revanced.integrations" minSdk = 23 targetSdk = 33 - versionCode = 1 - versionName = "1.0" multiDexEnabled = false - - val properties = Properties() - if (rootProject.file("local.properties").exists()) { - properties.load(FileInputStream(rootProject.file("local.properties"))) - } - - buildConfigField("String", "YT_API_KEY", "\"${properties.getProperty("youtubeAPIKey", "")}\"") + versionName = project.version as String } buildTypes { From 4c18633c364491a1d699f92f1bc519517632d709 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 2 Jan 2023 02:50:32 +0100 Subject: [PATCH 6/6] build: name output files Signed-off-by: oSumAtrIX --- app/build.gradle.kts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f07e39f1..23239f63 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,17 @@ android { buildTypes { release { isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + applicationVariants.all { + outputs.all { + this as com.android.build.gradle.internal.api.ApkVariantOutputImpl + + outputFileName = "${rootProject.name}-$versionName.apk" + } } } compileOptions {