Adjust build scripts and move code for appid change

issues/111-change-appid
Adam Novak 4 years ago
parent faba50a252
commit 5871e3ee23

@ -21,7 +21,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
android { android {
compileSdkVersion Config.compileSdkVersion compileSdkVersion Config.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "network.novak" applicationId "io.github.fork_maintainers"
minSdkVersion Config.minSdkVersion minSdkVersion Config.minSdkVersion
targetSdkVersion Config.targetSdkVersion targetSdkVersion Config.targetSdkVersion
versionCode 1 versionCode 1
@ -109,20 +109,22 @@ android {
forkDebug { forkDebug {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
applicationIdSuffix ".fenix.debug" applicationIdSuffix ".iceraven.debug"
resValue "bool", "IS_DEBUG", "true" resValue "bool", "IS_DEBUG", "true"
pseudoLocalesEnabled true pseudoLocalesEnabled true
// Need to replicate default debug config features // Need to replicate default debug config features
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
debuggable true debuggable true
def deepLinkSchemeValue = "iceraven-debug"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
// Use custom default allowed addon list // Use custom default allowed addon list
buildConfigField "String", "AMO_ACCOUNT", "\"16201230\"" buildConfigField "String", "AMO_ACCOUNT", "\"16201230\""
buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\"" buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\""
} }
forkRelease releaseTemplate >> { forkRelease releaseTemplate >> {
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
applicationIdSuffix ".iceweasel" applicationIdSuffix ".iceraven"
def deepLinkSchemeValue = "fenix" def deepLinkSchemeValue = "iceraven"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
manifestPlaceholders = [ manifestPlaceholders = [
"deepLinkScheme": deepLinkSchemeValue "deepLinkScheme": deepLinkSchemeValue

@ -11,7 +11,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="network.novak.iceweasel" android:targetPackage="io.github.fork_maintainers.iceraven"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
@ -22,7 +22,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="network.novak.iceweasel" android:targetPackage="io.github.fork_maintainers.iceraven"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>

@ -88,7 +88,7 @@ object SupportUtils {
fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) { fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) {
getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ) getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ)
} else if (Config.channel.isFork) { } else if (Config.channel.isFork) {
"https://github.com/fork-maintainers/iceweasel/releases" "https://github.com/fork-maintainers/iceraven-browser/releases"
} else { } else {
getSumoURLForTopic(context, SumoTopic.WHATS_NEW) getSumoURLForTopic(context, SumoTopic.WHATS_NEW)
} }

Loading…
Cancel
Save