Skip to content

Commit

Permalink
0005140: Remove propdeps plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip Marzullo committed May 9, 2022
1 parent 4de5798 commit aa7dadc
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 10 deletions.
1 change: 0 additions & 1 deletion symmetric-assemble/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {
dependencies {
classpath 'org.asciidoctor:asciidoctorj-pdf:1.6.2'
classpath 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.4.2'
classpath 'com.bmuschko:gradle-docker-plugin:3.2.1'
Expand Down
33 changes: 28 additions & 5 deletions symmetric-assemble/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,40 @@ subprojects { subproject ->

apply plugin: 'com.github.hierynomus.license'
apply plugin: 'java-library'
apply plugin: 'propdeps'
apply plugin: 'propdeps-maven'
apply plugin: 'propdeps-eclipse'
apply plugin: 'maven'
apply plugin: 'jacoco'

configurations { deployerJars }
configurations { testArtifacts.extendsFrom testRuntime }

configurations.provided.transitive = true
configurations.optional.transitive = false
configurations {
provided {
canBeResolved = true
canBeConsumed = true
visible = false
transitive = true
allDependencies.all {
dep -> configurations.default.exclude(group: dep.group, module: dep.name)
}
}
api.extendsFrom(provided)
project.conf2ScopeMappings.addMapping(300 + 1,
project.configurations.provided, "provided")
// Ensure only the compile configuration is exported
project.eclipse.classpath.file {
whenMerged { classpath ->
def resolved = project.configurations.compile.resolve()
classpath.entries.findAll{it.kind == 'lib'}.each {
it.exported = resolved.contains(project.file(it.path))
}
}
}
project.idea.module {
// IDEA internally deals with 4 scopes : COMPILE, TEST, PROVIDED, RUNTIME
// but only PROVIDED seems to be picked up
scopes.PROVIDED.plus += [project.configurations.provided]
}
}

sourceCompatibility=1.8
targetCompatibility=1.8
Expand Down
4 changes: 0 additions & 4 deletions symmetric-sqlexplorer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {
}

dependencies {
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
classpath 'com.devsoap.plugin:gradle-vaadin-plugin:2.0.0.beta1'
}
}
Expand All @@ -19,9 +18,6 @@ plugins {
apply from: symAssembleDir + '/common.gradle'

apply plugin: 'maven'
apply plugin: 'propdeps'
apply plugin: 'propdeps-maven'
apply plugin: 'propdeps-eclipse'

configurations { deployerJars }

Expand Down

0 comments on commit aa7dadc

Please sign in to comment.