mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-15 18:12:54 +00:00
56b21426eb
* For #5574 - Part 1: Port TabAction.SaveTabGroup to TabSessionInteractor and SessionControlController. (#6651) - Introduces the TabSessionInteractor, SessionControlInteractor and SessionControlController classes. - Removes the TabAction.SaveTabGroup. * For #5574 - Part 2: Port TabAction.PrivateBrowsingLearnMore to TabSessionInteractor and SessionControlController (#6651) * For #5574 - Part 3: Port TabAction.ShareTabs to TabSessionInteractor and SessionControlController (#6651) * For #5574 - Part 4: Remove unused TabAction.Share and TabItemMenu (#6651) In #2205, the tab overflow button was removed which would have shown the TabItemMenu when clicked. So, we can remove TabItemMenu since it is not used and as a result, we can also remove TabAction.Share since there are no consumers. * For #5574 - Part 5: Port TabAction.PlayMedia and TabAction.PauseMedia to TabSessionInteractor and SessionControlController (#6651) * For #5574 - Part 6: Port TabAction.Select to TabSessionInteractor and SessionControlController (#6651) * For #5574 - Part 7: Port Onboarding.Finish to OnboardingInteractor and SessionControlController (#6651) * For #5574 - Part 8: Port TabAction.Close and TabAction.CloseAll to TabSessionInteractor and SessionControlController (#6651) - Removes TabAction * For #5574 - Part 9: Port CollectionAction.Delete to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 10: Port CollectionAction.ShareTabs to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 11: Port CollectionAction.AddTab and CollectionAction.Rename to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 12: Port CollectionAction.RemoveTab to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 13: Port CollectionAction.OpenTab to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 14: Port CollectionAction.CloseTabs to CollectionInteractor and SessionControlController (#6651) * For #5574 - Part 15: Introduce a HomeFragmentStore (#6651) - We will hook up the HomeFragmentStore in later parts. - Removes List<Tab>.toSessionBundle(context: Context) since it is unused. * For #5574 - Part 16: Port CollectionAction.Collapse and CollectionAction.Expand to CollectionInteractor and SessionControlController (#6651) - We assume the store is hooked up to the SessionControlController in this part, but this work will be done in a later part. - Removes CollectionAction. * For #5574 - Part 20: Remove the architecture module. (#6651) * For #5574 - Part 17: Remove duplicate subscribeToTabCollections in BrowserFragment.kt (#6651) There is a duplicate call of subscribeToTabCollections() in both HomeFragment and BrowserFragment. In this patch, we remove the call in BrowserFragment to avoid passing the HomeFragmentStore to BrowserFragment in order to dispatch the CollectionsChange event. * For #5574 - Part 18: Delete SessionControlComponent and fix TabCollection and Tab imports (#6651) * For #5574 - Part 19: Use the new HomeFragmentStore in the HomeFragment (#6651) - Renames SessionControlUIView to SessionControlView * For #5574 - Part 21: Fix white screen on home fragment (#6651) * For #5574 - Part 22: Fix formatting in SessionControlInteractor and replace See with @see in SessionControlController (#6651) * For #5574 - Part 23: Move to metrics.track call to the beginning of handleCollectionRemoveTab (#6651) This ensures that the metrics.track will be called immediately before the tab is removed from the collection. * For #5574 - Part 24: Use the sessionManager getter in SessionControlController (#6651) * For #5574 - Part 25: Use mapNotNull in List<Tab>.toSessionBundle (#6651) * For #5574 - Part 26: Simplify closeTab and closeAllTabs functions by assigning a deletionJob constant (#6651) * For #5574 - Part 27: Replace listOf() with emptyList() in removeAllTabsWithUndo (#6651) * For #5574 - Part 28: Replace the Context parameter with the HomeActivity in SessionControlController (#6651) * For #5574 - Part 29: Add test for HomeFragmentStore, DefaultSessionControlController and SessionControlInteractor (#6651) * For #5574 - Removes running CI against the architecture debug build varient
73 lines
3.3 KiB
Groovy
73 lines
3.3 KiB
Groovy
include ':app'
|
|
|
|
def log(message) {
|
|
logger.lifecycle("[settings] ${message}")
|
|
}
|
|
|
|
def runCmd(cmd, workingDir, successMessage) {
|
|
def proc = cmd.execute(null, new File(workingDir))
|
|
def standardOutput = new ByteArrayOutputStream()
|
|
def standardError = new ByteArrayOutputStream()
|
|
proc.consumeProcessOutput(standardOutput, standardError)
|
|
proc.waitFor()
|
|
|
|
if (proc.exitValue() != 0) {
|
|
throw new GradleException("Process '${cmd}' finished with non-zero exit value ${proc.exitValue()}:\n\nstdout:\n${standardOutput.toString()}\n\nstderr:\n${standardError.toString()}")
|
|
} else {
|
|
log(successMessage)
|
|
}
|
|
return standardOutput
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
// Local Development overrides
|
|
//////////////////////////////////////////////////////////////////////////
|
|
|
|
Properties localProperties = null
|
|
String settingAppServicesPath = "substitutions.application-services.dir"
|
|
String settingAndroidComponentsPath = "autoPublish.android-components.dir"
|
|
|
|
if (file('local.properties').canRead()) {
|
|
localProperties = new Properties()
|
|
localProperties.load(file('local.properties').newDataInputStream())
|
|
log('Loaded local.properties')
|
|
} else {
|
|
log('Missing local.properties; see https://github.com/mozilla-mobile/fenix/blob/master/README.md#local-properties-helpers for instructions.')
|
|
}
|
|
|
|
if (localProperties != null) {
|
|
localProperties.each { prop ->
|
|
gradle.ext.set("localProperties.${prop.key}", prop.value)
|
|
}
|
|
|
|
String appServicesLocalPath = localProperties.getProperty(settingAppServicesPath)
|
|
|
|
if (appServicesLocalPath != null) {
|
|
log("Enabling composite build with application-services modules from: $appServicesLocalPath")
|
|
includeBuild(appServicesLocalPath)
|
|
} else {
|
|
log("Disabled composite builds with application-services. Enable them by settings '$settingAppServicesPath' in local.properties")
|
|
}
|
|
|
|
String androidComponentsLocalPath = localProperties.getProperty(settingAndroidComponentsPath)
|
|
|
|
if (androidComponentsLocalPath != null) {
|
|
log("Enabling automatic publication of android-components from: $androidComponentsLocalPath")
|
|
log("Determining if android-components are up-to-date...")
|
|
def compileAcCmd = ["${androidComponentsLocalPath}/gradlew", "compileReleaseKotlin"]
|
|
def compileOutput = runCmd(compileAcCmd, androidComponentsLocalPath, "Compiled android-components.")
|
|
// This is somewhat brittle: parse last line of gradle output, to fish out how many tasks were executed.
|
|
// One executed task means gradle didn't do any work other than executing the top-level 'compile' task.
|
|
def compileTasksExecuted = compileOutput.toString().split('\n').last().split(':')[1].split(' ')[1]
|
|
if (compileTasksExecuted.equals("1")) {
|
|
log("android-components are up-to-date, skipping publication.")
|
|
} else {
|
|
log("android-components changed, publishing locally...")
|
|
def publishAcCmd = ["${androidComponentsLocalPath}/gradlew", "publishToMavenLocal", "-Plocal=true"]
|
|
runCmd(publishAcCmd, androidComponentsLocalPath, "Published android-components.")
|
|
}
|
|
} else {
|
|
log("Disabled auto-publication of android-components. Enable it by settings '$settingAndroidComponentsPath' in local.properties")
|
|
}
|
|
}
|