diff --git a/gradle/build.gradle b/gradle/build.gradle index 0227127cc..ed7843afe 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -13,7 +13,6 @@ buildscript { } plugins { - id 'maven-publish' id 'nebula.lint' version '10.4.2' // Config helper for annotation processors such as AutoValue and Dagger. // Ensures that source code is generated at an appropriate location. @@ -73,60 +72,6 @@ task stage { description = 'Generates application directories for all services.' } - -if (publishUrl) { - publishing { - repositories { - maven { - url publishUrl - } - } - } -} - -ext.processedDependencies = [] as Set -ext.processDependencies = { Set deps -> - - if (deps.isEmpty()) { - return - } - deps.each { ResolvedDependency dep -> - if (dep.moduleGroup == "nomulus" || - rootProject.processedDependencies.contains(dep.module.toString())) { - return - } - def name = "${dep.moduleGroup}_${dep.moduleName}_${dep.moduleVersion}" - rootProject.publishing { - publications { - "${name}"(MavenPublication) { - groupId = dep.moduleGroup - artifactId = dep.moduleName - version = dep.moduleVersion - dep.moduleArtifacts.each { moduleArtifact -> - artifact(moduleArtifact.file) { - classifier = moduleArtifact.classifier - } - } - if (!dep.children.isEmpty()) { - pom.withXml { - def dependenciesNode = asNode().appendNode("dependencies") - dep.children.each { - def dependencyNode = - dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.moduleGroup) - dependencyNode.appendNode("artifactId", it.moduleName) - dependencyNode.appendNode("version", it.moduleVersion) - } - } - } - } - } - } - rootProject.processedDependencies.add(dep.module.toString()) - rootProject.processDependencies(dep.children) - } -} - ext.constructMavenCoordinate = { deps, distinctMetadata -> if (deps.isEmpty()) { return @@ -146,31 +91,15 @@ allprojects { if (project.name == 'services') return repositories { - if (rootProject.repositoryUrl) { + if (rootProject.mavenUrl) { maven { - url rootProject.repositoryUrl + url rootProject.mavenUrl } } else { mavenCentral() } } - ext.generateDependencyPublications = { - def allconfigs = [] - - allconfigs.addAll(configurations) - // This only adds buildscript dependencies declare in this project. - allconfigs.addAll(buildscript.configurations) - - allconfigs.each { - if (!it.isCanBeResolved()) { - return - } - rootProject.processDependencies( - it.resolvedConfiguration.firstLevelModuleDependencies) - } - } - // This task generates a Maven coordinate for each resolved dependency and // stores them in the given file. task generateMavenCoordinateForDependency { @@ -218,8 +147,6 @@ subprojects { lockAllConfigurations() } - apply plugin: 'maven-publish' - def services = [':services:default', ':services:backend', ':services:tools', @@ -290,7 +217,6 @@ subprojects { appengine { deploy { - // TODO: change this to a variable. project = gcpProject } } @@ -413,5 +339,3 @@ subprojects { } } } - -generateDependencyPublications() diff --git a/gradle/buildSrc/build.gradle b/gradle/buildSrc/build.gradle index ab917aecb..4f0425ab6 100644 --- a/gradle/buildSrc/build.gradle +++ b/gradle/buildSrc/build.gradle @@ -1,12 +1,12 @@ repositories { - if (project.ext.properties.repositoryUrl == null) { + if (project.ext.properties.mavenUrl == null) { println "Plugins: Using Maven central..." mavenCentral() } else { maven { - println "Plugins: Using repo ${repositoryUrl}..." - url repositoryUrl + println "Plugins: Using repo ${mavenUrl}..." + url mavenUrl } } } diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle index bdf2e17cd..389e53af5 100644 --- a/gradle/core/build.gradle +++ b/gradle/core/build.gradle @@ -687,5 +687,3 @@ task nomulus(type: Jar) { with jar dependsOn project(':third_party').jar } - -generateDependencyPublications() diff --git a/gradle/gradle.properties b/gradle/gradle.properties index 281272e87..8620c8578 100644 --- a/gradle/gradle.properties +++ b/gradle/gradle.properties @@ -1,5 +1,5 @@ -repositoryUrl= -publishUrl= +mavenUrl= +pluginsUrl= uploaderDestination= uploaderCredentialsFile= uploaderMultithreadedUpload= diff --git a/gradle/proxy/build.gradle b/gradle/proxy/build.gradle index c10d8888b..a3210c41c 100644 --- a/gradle/proxy/build.gradle +++ b/gradle/proxy/build.gradle @@ -74,5 +74,3 @@ dependencies { annotationProcessor deps['com.google.dagger:dagger-compiler'] testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] } - -generateDependencyPublications() diff --git a/gradle/settings.gradle b/gradle/settings.gradle index cb3438ba0..fb1f9560f 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -1,9 +1,9 @@ -if (repositoryUrl) { - println "Using repository $repositoryUrl for plugins" +if (pluginsUrl) { + println "Using repository $pluginsUrl for plugins" pluginManagement { repositories { maven { - url repositoryUrl + url pluginsUrl } } } diff --git a/gradle/util/build.gradle b/gradle/util/build.gradle index 289b882a2..c00b77019 100644 --- a/gradle/util/build.gradle +++ b/gradle/util/build.gradle @@ -30,5 +30,3 @@ dependencies { testAnnotationProcessor deps['com.google.auto.value:auto-value'] testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] } - -generateDependencyPublications()