111 lines
4.8 KiB
Diff
111 lines
4.8 KiB
Diff
|
From 97e9952767f758c8837d6aa14909724e836b8d6c Mon Sep 17 00:00:00 2001
|
||
|
|
From: harvey186 <harvey186@hotmail.com>
|
||
|
|
Date: Fri, 31 May 2024 11:17:31 +0200
|
||
|
|
Subject: [PATCH] build gradle
|
||
|
|
|
||
|
|
---
|
||
|
|
app/build.gradle | 8 ++--
|
||
|
|
pacthes/0001-before_first_build.patch | 62 +++++++++++++++++++++++++++
|
||
|
|
2 files changed, 66 insertions(+), 4 deletions(-)
|
||
|
|
create mode 100644 pacthes/0001-before_first_build.patch
|
||
|
|
|
||
|
|
diff --git a/app/build.gradle b/app/build.gradle
|
||
|
|
index 16e762634..39887216e 100644
|
||
|
|
--- a/app/build.gradle
|
||
|
|
+++ b/app/build.gradle
|
||
|
|
@@ -31,7 +31,7 @@ android {
|
||
|
|
}
|
||
|
|
|
||
|
|
defaultConfig {
|
||
|
|
- applicationId "io.github.forkmaintainers"
|
||
|
|
+ applicationId "com.leos"
|
||
|
|
minSdkVersion config.minSdkVersion
|
||
|
|
compileSdk config.compileSdkVersion
|
||
|
|
targetSdkVersion config.targetSdkVersion
|
||
|
|
@@ -180,11 +180,11 @@ android {
|
||
|
|
}
|
||
|
|
forkRelease releaseTemplate >> {
|
||
|
|
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
|
||
|
|
- applicationIdSuffix ".iceraven"
|
||
|
|
- def deepLinkSchemeValue = "iceraven"
|
||
|
|
+ applicationIdSuffix ".leosium"
|
||
|
|
+ def deepLinkSchemeValue = "leosium"
|
||
|
|
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
|
||
|
|
manifestPlaceholders.putAll([
|
||
|
|
- "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID",
|
||
|
|
+ "sharedUserId": "io.github.forkmaintainers.leosium.sharedID",
|
||
|
|
"deepLinkScheme": deepLinkSchemeValue,
|
||
|
|
])
|
||
|
|
// Use custom default allowed addon list
|
||
|
|
diff --git a/pacthes/0001-before_first_build.patch b/pacthes/0001-before_first_build.patch
|
||
|
|
new file mode 100644
|
||
|
|
index 000000000..62a9a6403
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/pacthes/0001-before_first_build.patch
|
||
|
|
@@ -0,0 +1,62 @@
|
||
|
|
+Subject: [PATCH] 0001-before first build
|
||
|
|
+---
|
||
|
|
+Index: app/build.gradle
|
||
|
|
+IDEA additional info:
|
||
|
|
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||
|
|
+<+>UTF-8
|
||
|
|
+===================================================================
|
||
|
|
+diff --git a/app/build.gradle b/app/build.gradle
|
||
|
|
+--- a/app/build.gradle (revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
|
||
|
|
++++ b/app/build.gradle (revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
|
||
|
|
+@@ -330,8 +330,8 @@
|
||
|
|
+ // same version code. Therefore we need to have different version codes for our ARM and x86
|
||
|
|
+ // builds.
|
||
|
|
+
|
||
|
|
+- def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
|
||
|
|
+- println("versionName override: $versionName")
|
||
|
|
++// def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
|
||
|
|
++// println("versionName override: $versionName")
|
||
|
|
+
|
||
|
|
+ variant.outputs.each { output ->
|
||
|
|
+ def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
|
||
|
|
+@@ -934,4 +934,4 @@
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // Enable expiration by major version.
|
||
|
|
+-ext.gleanExpireByVersion = Config.majorVersion()
|
||
|
|
++ext.gleanExpireByVersion = 26
|
||
|
|
+Index: app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
|
||
|
|
+IDEA additional info:
|
||
|
|
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||
|
|
+<+>UTF-8
|
||
|
|
+===================================================================
|
||
|
|
+diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
|
||
|
|
+--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt (revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
|
||
|
|
++++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt (revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
|
||
|
|
+@@ -143,10 +143,6 @@
|
||
|
|
+ showAlertDialog()
|
||
|
|
+ true
|
||
|
|
+ }
|
||
|
|
+- R.id.addons_sideload -> {
|
||
|
|
+- installFromFile()
|
||
|
|
+- true
|
||
|
|
+- }
|
||
|
|
+ R.id.search -> {
|
||
|
|
+ true
|
||
|
|
+ }
|
||
|
|
+Index: app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
|
||
|
|
+IDEA additional info:
|
||
|
|
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||
|
|
+<+>UTF-8
|
||
|
|
+===================================================================
|
||
|
|
+diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
|
||
|
|
+--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt (revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
|
||
|
|
++++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt (revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
|
||
|
|
+@@ -593,7 +593,6 @@
|
||
|
|
+ }
|
||
|
|
+ },
|
||
|
|
+ ),
|
||
|
|
+- showTopRecentSites = settings.showTopRecentSites,
|
||
|
|
+ )
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|