mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-11-25 09:00:26 +00:00
Submodule fixes
This commit is contained in:
parent
55da767dab
commit
9e1363c5df
5 changed files with 17 additions and 17 deletions
|
@ -5,11 +5,11 @@ plugins {
|
|||
id "org.moditect.gradleplugin" version "1.0.0-rc3"
|
||||
}
|
||||
|
||||
apply from: "$rootDir/deps/java.gradle"
|
||||
apply from: "$rootDir/deps/junit.gradle"
|
||||
apply from: "$projectDir/../deps/java.gradle"
|
||||
apply from: "$projectDir/../deps/junit.gradle"
|
||||
|
||||
System.setProperty('excludeExtensionLibrary', 'true')
|
||||
apply from: "$rootDir/deps/extension_test.gradle"
|
||||
apply from: "$projectDir/../deps/extension_test.gradle"
|
||||
|
||||
version = file('../misc/version').text
|
||||
group = 'io.xpipe'
|
||||
|
@ -35,4 +35,4 @@ configurations {
|
|||
|
||||
|
||||
apply from: 'publish.gradle'
|
||||
apply from: "$rootDir/deps/publish-base.gradle"
|
||||
apply from: "$projectDir/../deps/publish-base.gradle"
|
|
@ -5,8 +5,8 @@ plugins {
|
|||
id "org.moditect.gradleplugin" version "1.0.0-rc3"
|
||||
}
|
||||
|
||||
apply from: "$rootDir/deps/java.gradle"
|
||||
apply from: "$rootDir/deps/lombok.gradle"
|
||||
apply from: "$projectDir/../deps/java.gradle"
|
||||
apply from: "$projectDir/../deps/lombok.gradle"
|
||||
|
||||
dependencies {
|
||||
}
|
||||
|
@ -24,4 +24,4 @@ dependencies {
|
|||
}
|
||||
|
||||
apply from: 'publish.gradle'
|
||||
apply from: "$rootDir/deps/publish-base.gradle"
|
||||
apply from: "$projectDir/../deps/publish-base.gradle"
|
||||
|
|
|
@ -5,9 +5,9 @@ plugins {
|
|||
id "org.moditect.gradleplugin" version "1.0.0-rc3"
|
||||
}
|
||||
|
||||
apply from: "$rootDir/deps/java.gradle"
|
||||
apply from: "$rootDir/deps/lombok.gradle"
|
||||
apply from: "$rootDir/deps/junit.gradle"
|
||||
apply from: "$projectDir/../deps/java.gradle"
|
||||
apply from: "$projectDir/../deps/lombok.gradle"
|
||||
apply from: "$projectDir/../deps/junit.gradle"
|
||||
|
||||
compileJava {
|
||||
options.compilerArgs << '-parameters'
|
||||
|
@ -28,4 +28,4 @@ repositories {
|
|||
}
|
||||
|
||||
apply from: 'publish.gradle'
|
||||
apply from: "$rootDir/deps/publish-base.gradle"
|
||||
apply from: "$projectDir/../deps/publish-base.gradle"
|
2
deps
2
deps
|
@ -1 +1 @@
|
|||
Subproject commit 2fe3d49953de977f50540e677f61b2463b1e8b82
|
||||
Subproject commit 23936c9a6a2ec35f0ca71266debb93d06144df9d
|
|
@ -5,9 +5,9 @@ plugins {
|
|||
id "org.moditect.gradleplugin" version "1.0.0-rc3"
|
||||
}
|
||||
|
||||
apply from: "$rootDir/deps/java.gradle"
|
||||
apply from: "$rootDir/deps/javafx.gradle"
|
||||
apply from: "$rootDir/deps/lombok.gradle"
|
||||
apply from: "$projectDir/../deps/java.gradle"
|
||||
apply from: "$projectDir/../deps/javafx.gradle"
|
||||
apply from: "$projectDir/../deps/lombok.gradle"
|
||||
|
||||
configurations {
|
||||
compileOnly.extendsFrom(dep)
|
||||
|
@ -32,7 +32,7 @@ dependencies {
|
|||
compileOnly 'org.controlsfx:controlsfx:11.1.1'
|
||||
compileOnly 'org.apache.commons:commons-lang3:3.12.0'
|
||||
|
||||
if (project(':fxcomps') != null) {
|
||||
if (findProject(':fxcomps') != null) {
|
||||
compileOnly project(':fxcomps')
|
||||
} else {
|
||||
compileOnly 'io.xpipe:fxcomps:0.3.2'
|
||||
|
@ -41,4 +41,4 @@ dependencies {
|
|||
|
||||
|
||||
apply from: 'publish.gradle'
|
||||
apply from: "$rootDir/deps/publish-base.gradle"
|
||||
apply from: "$projectDir/../deps/publish-base.gradle"
|
||||
|
|
Loading…
Reference in a new issue