aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2021-09-04 01:52:47 +0200
committerJulien Gouesse <[email protected]>2021-09-04 01:52:47 +0200
commit0d3778a529cfd1fe0fea6ce9883e729ba6839716 (patch)
tree9f039e08d6deaba34d36ff18ff0f9851bb308e03
parent38752a7146c4fb21ac3e118a7ffc7a8331a731e8 (diff)
Fixes gradle build with Gradle 7.2
Diffstat
-rw-r--r--ardor3d-animation/build.gradle2
-rw-r--r--ardor3d-awt/build.gradle2
-rw-r--r--ardor3d-collada/build.gradle2
-rw-r--r--ardor3d-core/build.gradle1
-rw-r--r--ardor3d-craft/build.gradle2
-rw-r--r--ardor3d-effects/build.gradle2
-rw-r--r--ardor3d-examples/build.gradle16
-rw-r--r--ardor3d-extras/build.gradle2
-rw-r--r--ardor3d-jogl-awt/build.gradle2
-rw-r--r--ardor3d-jogl-swt/build.gradle12
-rw-r--r--ardor3d-jogl/build.gradle2
-rw-r--r--ardor3d-swt/build.gradle12
-rw-r--r--ardor3d-terrain/build.gradle2
-rw-r--r--ardor3d-ui/build.gradle2
-rw-r--r--build.gradle22
15 files changed, 79 insertions, 4 deletions
diff --git a/ardor3d-animation/build.gradle b/ardor3d-animation/build.gradle
index 95bc84a..84c36e1 100644
--- a/ardor3d-animation/build.gradle
+++ b/ardor3d-animation/build.gradle
@@ -2,4 +2,6 @@
description = 'Ardor 3D Skinning and Animation System'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-awt/build.gradle b/ardor3d-awt/build.gradle
index 2be77c5..4239213 100644
--- a/ardor3d-awt/build.gradle
+++ b/ardor3d-awt/build.gradle
@@ -2,4 +2,6 @@
description = 'Ardor 3D AWT'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-collada/build.gradle b/ardor3d-collada/build.gradle
index dbf072d..6df103c 100644
--- a/ardor3d-collada/build.gradle
+++ b/ardor3d-collada/build.gradle
@@ -3,6 +3,8 @@ description = 'Ardor 3D Collada Importer'
dependencies {
implementation project(':ardor3d-core')
implementation project(':ardor3d-animation')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
implementation group: 'org.jdom', name: 'jdom2', version:'2.0.4'
implementation group: 'jaxen', name: 'jaxen', version:'1.1.4'
}
diff --git a/ardor3d-core/build.gradle b/ardor3d-core/build.gradle
index d2b4f65..a7472e2 100644
--- a/ardor3d-core/build.gradle
+++ b/ardor3d-core/build.gradle
@@ -2,4 +2,5 @@
description = 'Ardor 3D Core'
dependencies {
implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-craft/build.gradle b/ardor3d-craft/build.gradle
index 91f0058..c268722 100644
--- a/ardor3d-craft/build.gradle
+++ b/ardor3d-craft/build.gradle
@@ -3,6 +3,8 @@ description = 'Ardor 3D Craft'
dependencies {
implementation project(':ardor3d-awt')
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version:'2.3.0.1'
implementation group: 'javax.xml.bind', name: 'jaxb-api', version:'2.3.1'
implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version:'2.3.1'
diff --git a/ardor3d-effects/build.gradle b/ardor3d-effects/build.gradle
index 6ec7015..b449aa8 100644
--- a/ardor3d-effects/build.gradle
+++ b/ardor3d-effects/build.gradle
@@ -2,4 +2,6 @@
description = 'Ardor 3D Effects'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-examples/build.gradle b/ardor3d-examples/build.gradle
index b2e4e37..82a4420 100644
--- a/ardor3d-examples/build.gradle
+++ b/ardor3d-examples/build.gradle
@@ -13,4 +13,20 @@ dependencies {
implementation project(':ardor3d-terrain')
implementation project(':ardor3d-ui')
implementation project(':ardor3d-craft')
+ implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
+ implementation project(':ardor3d-animation')
+ implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2'
+ implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2'
+ def os = System.getProperty("os.name").toLowerCase()
+ if (os.contains("windows")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.win32.win32.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("linux")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.gtk.linux.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("mac")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.cocoa.macosx.x86_64', version:'3.106.3'
+ }
}
diff --git a/ardor3d-extras/build.gradle b/ardor3d-extras/build.gradle
index f852b3d..1bfd4cc 100644
--- a/ardor3d-extras/build.gradle
+++ b/ardor3d-extras/build.gradle
@@ -2,4 +2,6 @@
description = 'Ardor 3D Extras Package'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-jogl-awt/build.gradle b/ardor3d-jogl-awt/build.gradle
index 632c1ba..7b73304 100644
--- a/ardor3d-jogl-awt/build.gradle
+++ b/ardor3d-jogl-awt/build.gradle
@@ -4,4 +4,6 @@ dependencies {
implementation project(':ardor3d-core')
implementation project(':ardor3d-awt')
implementation project(':ardor3d-jogl')
+ implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2'
+ implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2'
}
diff --git a/ardor3d-jogl-swt/build.gradle b/ardor3d-jogl-swt/build.gradle
index 4b3a592..c210901 100644
--- a/ardor3d-jogl-swt/build.gradle
+++ b/ardor3d-jogl-swt/build.gradle
@@ -4,4 +4,16 @@ dependencies {
implementation project(':ardor3d-core')
implementation project(':ardor3d-swt')
implementation project(':ardor3d-jogl')
+ implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2'
+ implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2'
+ def os = System.getProperty("os.name").toLowerCase()
+ if (os.contains("windows")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.win32.win32.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("linux")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.gtk.linux.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("mac")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.cocoa.macosx.x86_64', version:'3.106.3'
+ }
}
diff --git a/ardor3d-jogl/build.gradle b/ardor3d-jogl/build.gradle
index bf238df..55ef4bd 100644
--- a/ardor3d-jogl/build.gradle
+++ b/ardor3d-jogl/build.gradle
@@ -2,6 +2,8 @@
description = 'Ardor 3D JOGL'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2'
implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2'
}
diff --git a/ardor3d-swt/build.gradle b/ardor3d-swt/build.gradle
index 9d6f468..e862238 100644
--- a/ardor3d-swt/build.gradle
+++ b/ardor3d-swt/build.gradle
@@ -2,5 +2,15 @@
description = 'Ardor 3D SWT'
dependencies {
implementation project(':ardor3d-core')
- implementation group: 'org.eclipse.swt', name: 'org.eclipse.swt.gtk.linux.x86_64', version:'3.8'
+ implementation project(':ardor3d-savable')
+ def os = System.getProperty("os.name").toLowerCase()
+ if (os.contains("windows")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.win32.win32.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("linux")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.gtk.linux.x86_64', version:'3.106.3'
+ }
+ else if (os.contains("mac")) {
+ implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt.cocoa.macosx.x86_64', version:'3.106.3'
+ }
}
diff --git a/ardor3d-terrain/build.gradle b/ardor3d-terrain/build.gradle
index 627b6ef..544deb9 100644
--- a/ardor3d-terrain/build.gradle
+++ b/ardor3d-terrain/build.gradle
@@ -3,4 +3,6 @@ description = 'Ardor 3D Terrain'
dependencies {
implementation project(':ardor3d-core')
implementation project(':ardor3d-awt')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/ardor3d-ui/build.gradle b/ardor3d-ui/build.gradle
index 64aef03..03a66de 100644
--- a/ardor3d-ui/build.gradle
+++ b/ardor3d-ui/build.gradle
@@ -2,4 +2,6 @@
description = 'Ardor 3D UI'
dependencies {
implementation project(':ardor3d-core')
+ implementation project(':ardor3d-math')
+ implementation project(':ardor3d-savable')
}
diff --git a/build.gradle b/build.gradle
index 9316107..039f81c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,13 +24,29 @@ artifacts.archives packageSources
mavenLocal()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
- maven { url "http://repo.maven.apache.org/maven2" }
- maven { url "http://jogamp.org/deployment/maven" }
+ maven { url "https://repo.maven.apache.org/maven2" }
+ maven { url "https://jogamp.org/deployment/maven" }
maven { url "https://swt-repo.googlecode.com/svn/repo/" }
}
configurations.all {
-}
+ resolutionStrategy {
+ dependencySubstitution {
+ // The maven property ${osgi.platform} is not handled by Gradle
+ // so we replace the dependency, using the osgi platform from the project settings
+ def os = System.getProperty("os.name").toLowerCase()
+ if (os.contains("windows")) {
+ substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:3.106.3")
+ }
+ else if (os.contains("linux")) {
+ substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:3.106.3")
+ }
+ else if (os.contains("mac")) {
+ substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:3.106.3")
+ }
+ }
+ }
+ }
dependencies {
testImplementation group: 'junit', name: 'junit', version:'4.13.2'
testImplementation group: 'org.easymock', name: 'easymock', version:'4.3'
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 13:52:53 +0000