diff --git a/build.gradle b/build.gradle index 199245e5..2233f3c1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocatio buildscript { repositories { - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } @@ -59,7 +59,7 @@ apply from: file('gradle/ghPages.gradle') apply from: file('gradle/dependencies.gradle') repositories { - jcenter() + mavenCentral() } test { @@ -93,7 +93,7 @@ sourceCompatibility = '1.8' targetCompatibility = '1.8' task downloadDependencies(type: Exec) { - dependsOn configurations.testRuntime + dependsOn configurations.testRuntimeClasspath commandLine 'echo', 'Downloaded all dependencies' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 68e1c240..99bf70df 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -3,7 +3,7 @@ import org.codehaus.groovy.control.CompilerConfiguration apply plugin: 'groovy' repositories { - jcenter() + mavenCentral() } ScriptHolder holder = new ScriptHolder() diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy index 8ccbb8f1..67068370 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy @@ -4,14 +4,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Action import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer -import org.gradle.api.artifacts.maven.MavenPom import org.gradle.api.attributes.Bundling import org.gradle.api.attributes.Category import org.gradle.api.attributes.LibraryElements import org.gradle.api.attributes.Usage import org.gradle.api.plugins.JavaPluginConvention -import org.gradle.api.plugins.MavenPlugin import org.gradle.api.tasks.Upload import org.gradle.configuration.project.ProjectConfigurationActionContainer import org.gradle.util.GradleVersion @@ -104,14 +101,16 @@ class ShadowJavaPlugin implements Plugin { return } upload.configuration = project.configurations.shadow - MavenPom pom = upload.repositories.mavenDeployer.pom + def pom = upload.repositories.mavenDeployer.pom if (project.configurations.findByName("api")) { pom.scopeMappings.mappings.remove(project.configurations.api) } pom.scopeMappings.mappings.remove(project.configurations.compile) pom.scopeMappings.mappings.remove(project.configurations.implementation) pom.scopeMappings.mappings.remove(project.configurations.runtime) - pom.scopeMappings.addMapping(MavenPlugin.RUNTIME_PRIORITY, project.configurations.shadow, Conf2ScopeMappingContainer.RUNTIME) + pom.scopeMappings.addMapping(org.gradle.api.plugins.MavenPlugin.RUNTIME_PRIORITY, + project.configurations.shadow, + org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.RUNTIME) } } }