Reapply "More gradle tweaks so our gradle files work unchanged in mozilla-central."

This reverts commit c7beef8.

Author: rvandermeulen

settings.gradle

@@ -42,7 +42,9 @@ buildscript {
     }
 }
 
-rootProject.name = "appservices"
+if (!gradle.root.hasProperty("mozconfig")) {
+    rootProject.name = "appservices"
+}
 
 def setupProject(name, projectProps, appServicesRootDir) {
     def path = projectProps.path

tools/nimbus-gradle-plugin/build.gradle

@@ -43,100 +43,83 @@ dependencies {
     implementation localGroovy()
 }
 
-tasks.register("lintRelease") {
-  doLast {
-    // Do nothing. We execute the same set of tasks for all our modules in parallel on taskcluster.
-    // This project doesn't have a lint task. To avoid special casing our automation I just added
-    // an empty lint task here.
-  }
-}
+// In app-services, we need all these tasks, which do nothing, so this module behaves like
+// our others and we do not need to special case it in automation.
+if (!gradle.root.hasProperty("mozconfig")) {
+    tasks.register("lintRelease") {
+        doLast {}
+    }
 
-tasks.register("assembleAndroidTest") {
-  doLast {
-    // Do nothing. Like the `lint` task above this is just a dummy task so that this module
-    // behaves like our others and we do not need to special case it in automation.
-  }
-}
+    tasks.register("assembleAndroidTest") {
+        doLast {}
+    }
 
-tasks.register("assembleRelease") {
-  doLast {
-    // Do nothing. Like the `lint` task above this is just a dummy task so that this module
-    // behaves like our others and we do not need to special case it in automation.
-  }
-}
+    tasks.register("assembleRelease") {
+        doLast {}
+    }
 
-tasks.register("testRelease") {
-  doLast {
-    // Do nothing. Like the `lint` task above this is just a dummy task so that this module
-    // behaves like our others and we do not need to special case it in automation.
-  }
-}
+    tasks.register("testRelease") {
+        doLast {}
+    }
 
-tasks.register("checkMavenArtifacts") {
-    doLast {
-        // Do nothing. Like the `lint` task above this is just a dummy task so that this module
-        // behaves like our others and we do not need to special case it in automation.
+    tasks.register("checkMavenArtifacts") {
+        doLast {}
     }
-}
 
-// Must match the implementation in publish.gradle
-static def getLocalPublicationTimestamp() {
-    def date = new Date()
-    return date.format('yyyyMMddHHmmss')
-}
+    // publish only makes sense in app-services.
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+
+                pom {
+                    groupId = rootProject.config.componentsGroupId
+                    artifactId = archivesBaseName
+                    description = project.ext.description
+                    version = rootProject.config.componentsVersion + (rootProject.hasProperty('local') ? '-' + rootProject.property('local') : '')
+
+                    licenses {
+                        license {
+                            name = properties.libLicense
+                            url = properties.libLicenseUrl
+                        }
+                    }
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-
-            pom {
-                groupId = rootProject.config.componentsGroupId
-                artifactId = archivesBaseName
-                description = project.ext.description
-                version = rootProject.config.componentsVersion + (rootProject.hasProperty('local') ? '-' + rootProject.property('local') : '')
-
-                licenses {
-                    license {
-                        name = properties.libLicense
-                        url = properties.libLicenseUrl
+                    developers {
+                        developer {
+                            name = 'Mozilla Nimbus Team'
+                            email = 'nimbus-team@mozilla.com'
+                        }
                     }
-                }
 
-                developers {
-                    developer {
-                        name = 'Mozilla Nimbus Team'
-                        email = 'nimbus-team@mozilla.com'
+                    scm {
+                        connection = properties.libVcsUrl
+                        developerConnection = properties.libVcsUrl
+                        url = properties.libUrl
                     }
                 }
+            }
+        }
 
-                scm {
-                    connection = properties.libVcsUrl
-                    developerConnection = properties.libVcsUrl
-                    url = properties.libUrl
+        if (it.hasProperty('android')) {
+            android {
+                singleVariant('release') {
+                    withSourcesJar()
                 }
             }
         }
-    }
 
-    if (it.hasProperty('android')) {
-        android {
-            singleVariant('release') {
-                withSourcesJar()
+        repositories {
+            maven {
+                url = "$buildDir/maven"
             }
         }
     }
 
-    repositories {
-        maven {
-            url = "$buildDir/maven"
+    publishing.publications.withType(MavenPublication).each {publication ->
+        def checkFileSizeTask = task "checkLibSizeForMavenArtifact-${publication.artifactId}"(type: Exec) {
+            commandLine "${rootProject.projectDir}/automation/check_artifact_size.sh", project.buildDir, publication.artifactId
         }
+        checkMavenArtifacts.dependsOn(checkFileSizeTask)
     }
 }
-
-publishing.publications.withType(MavenPublication).each {publication ->
-    def checkFileSizeTask = task "checkLibSizeForMavenArtifact-${publication.artifactId}"(type: Exec) {
-        commandLine "${rootProject.projectDir}/automation/check_artifact_size.sh", project.buildDir, publication.artifactId
-    }
-    checkMavenArtifacts.dependsOn(checkFileSizeTask)
-}

tools/nimbus-gradle-plugin/settings.gradle

@@ -2,6 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+if (gradle.root.hasProperty("mozconfig")) {
+    apply from: file('../../../../mobile/android/shared-settings.gradle')
+}
+
 import org.yaml.snakeyaml.Yaml
 buildscript {
     dependencies {
@@ -29,34 +33,41 @@ buildscript {
     }
 }
 
-def yaml = new Yaml()
-def buildconfig = yaml.load(new File(rootDir, '../../.buildconfig-android.yml').newInputStream())
+def yaml
+def buildconfig
+def calcVersion
 
-def calcVersion(buildconfig) {
-    def local = gradle.rootProject.findProperty("local")
-    def version = new File(rootDir, '../../version.txt').getText().trim()
+if (!gradle.root.hasProperty("mozconfig")) {
+    // This config stuff is only used in app-services.
+    yaml = new Yaml()
+    buildconfig = yaml.load(new File(rootDir, '../../.buildconfig-android.yml').newInputStream())
 
-    if (gradle.rootProject.hasProperty("nightlyVersion")) {
-        return gradle.rootProject.nightlyVersion
-    } else if(local) {
-        return '0.0.1-SNAPSHOT'
-    } else {
-        return version
+    calcVersion = { ->
+        def local = gradle.rootProject.findProperty("local")
+        def version = new File(rootDir, '../../version.txt').getText().trim()
+
+        if (gradle.rootProject.hasProperty("nightlyVersion")) {
+            return gradle.rootProject.nightlyVersion
+        } else if(local) {
+            return '0.0.1-SNAPSHOT'
+        } else {
+            return version
+        }
     }
-}
 
-gradle.projectsLoaded { ->
-    // Wait until root project is "loaded" before we set "config"
-    // XXX - there's no "config" here. This should be upgraded to use the same mechanism as the other components?
-    // Note that since this is set on "rootProject.ext", it will be "in scope" during the evaluation of all projects'
-    // gradle files. This means that they can just access "config.<value>", and it'll function properly
-    gradle.rootProject.ext.library = [
-            // You can use -Plocal=true to help with mavenLocal publishing workflow.
-            // It makes a fake version number that's smaller than any published version,
-            // which can be depended on specifically by the ./build-scripts/substitute-local-appservices.gradle
-            // but which is unlikely to be depended on by accident otherwise.
-            version: calcVersion(buildconfig),
-            groupId: buildconfig.groupId,
-    ]
-    gradle.rootProject.ext.description = buildconfig.projects["tooling-nimbus-gradle"].description
+    gradle.projectsLoaded { ->
+        // Wait until root project is "loaded" before we set "config"
+        // XXX - there's no "config" here. This should be upgraded to use the same mechanism as the other components?
+        // Note that since this is set on "rootProject.ext", it will be "in scope" during the evaluation of all projects'
+        // gradle files. This means that they can just access "config.<value>", and it'll function properly
+        gradle.rootProject.ext.library = [
+                // You can use -Plocal=true to help with mavenLocal publishing workflow.
+                // It makes a fake version number that's smaller than any published version,
+                // which can be depended on specifically by the ./build-scripts/substitute-local-appservices.gradle
+                // but which is unlikely to be depended on by accident otherwise.
+                version: calcVersion(),
+                groupId: buildconfig.groupId,
+        ]
+        gradle.rootProject.ext.description = buildconfig.projects["tooling-nimbus-gradle"].description
+    }
 }