Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

JDK-8220222: specify clearly gradle project dependencies #401

Merged
merged 3 commits into from Apr 3, 2019
Merged

JDK-8220222: specify clearly gradle project dependencies #401

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
555085b
JDK-8220222: specify clearly gradle project dependencies
christianheilmann Mar 1, 2019
5d28542
fixed code format
christianheilmann Mar 8, 2019
c74f3f3
Merge branch 'master' of github.com:javafxports/openjdk-jfx into deve…
christianheilmann Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
87 changes: 76 additions & 11 deletions build.gradle
View file
Open in desktop
Expand Up @@ -1849,12 +1849,24 @@ project(":base") {

sourceSets {
main
shims
test
shims {
java {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
}
test {
java {
compileClasspath += sourceSets.shims.output
runtimeClasspath += sourceSets.shims.output
}
}
}

dependencies {
testCompile group: "junit", name: "junit", version: "4.8.2"
testCompile sourceSets.main.output
testCompile sourceSets.shims.output
}

commonModuleSetup(project, [ 'base' ])
Expand Down Expand Up @@ -1911,16 +1923,27 @@ project(":graphics") {
sourceSets {
jslc // JSLC gramar subset
main
shims
shims {
java {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
}
shaders // generated shaders (prism & decora)
test
test {
java {
compileClasspath += sourceSets.shims.output
runtimeClasspath += sourceSets.shims.output
}
}
stub
}

dependencies {
stubCompile group: "junit", name: "junit", version: "4.8.2"

antlr group: "org.antlr", name: "antlr4", version: "4.7.2", classifier: "complete"
compile project(':base')
}

project.ext.moduleSourcePath = defaultModuleSourcePath_GraphicsOne
Expand Down Expand Up @@ -2329,8 +2352,18 @@ project(":controls") {

sourceSets {
main
shims
test
shims {
java {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
}
test {
java {
compileClasspath += sourceSets.shims.output
runtimeClasspath += sourceSets.shims.output
}
}
}

project.ext.moduleSourcePath = defaultModuleSourcePath
Expand All @@ -2341,6 +2374,8 @@ project(":controls") {
dependencies {
testCompile project(":graphics").sourceSets.test.output
testCompile project(":base").sourceSets.test.output
compile project(':base')
compile project(':graphics')
}

test {
Expand Down Expand Up @@ -2405,6 +2440,8 @@ project(":swing") {
commonModuleSetup(project, [ 'base', 'graphics', 'swing' ])

dependencies {
compile project(":base")
compile project(":graphics")
}

test {
Expand Down Expand Up @@ -2483,8 +2520,18 @@ project(":fxml") {

sourceSets {
main
shims
test
shims {
java {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
}
test {
java {
compileClasspath += sourceSets.shims.output
runtimeClasspath += sourceSets.shims.output
}
}
}

project.ext.moduleSourcePath = defaultModuleSourcePath
Expand All @@ -2496,6 +2543,8 @@ project(":fxml") {
dependencies {
testCompile project(":graphics").sourceSets.test.output
testCompile project(":base").sourceSets.test.output
compile project(":base")
compile project(":graphics")
}

test {
Expand Down Expand Up @@ -2542,6 +2591,8 @@ project(":media") {
media name: "libav-12.1", ext: "tar.gz"
media name: "ffmpeg-3.3.3", ext: "tar.gz"
}
compile project(":base")
compile project(":graphics")
}

compileJava.dependsOn updateCacheIfNeeded
Expand Down Expand Up @@ -3111,8 +3162,18 @@ project(":web") {

sourceSets {
main
shims
test
shims {
java {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
}
test {
java {
compileClasspath += sourceSets.shims.output
runtimeClasspath += sourceSets.shims.output
}
}
}

project.ext.moduleSourcePath = defaultModuleSourcePath
Expand All @@ -3121,6 +3182,10 @@ project(":web") {
commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'media', 'web' ])

dependencies {
compile project(":base")
compile project(":graphics")
compile project(":controls")
compile project(":media")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should a dependency on controls be added here as well?

}

compileJava.dependsOn updateCacheIfNeeded
Expand Down Expand Up @@ -3273,7 +3338,7 @@ project(":web") {
}

def copyNativeTask = task("copyNative${t.capital}", type: Copy,
dependsOn: [compileNativeTask, , copyDumpTreeNativeTask]) {
dependsOn: [compileNativeTask, copyDumpTreeNativeTask]) {
enabled = (IS_COMPILE_WEBKIT)
def library = rootProject.ext[t.upper].library
from "$webkitOutputDir/$webkitConfig/$dllDir/${library('jfxwebkit')}"
Expand Down