Browse Source

Update to regular 3.4 maven dependencies instead of a custom composite build.

MeFisto94 3 years ago
parent
commit
9ea392e078
5 changed files with 26 additions and 157 deletions
  1. 26 84
      build.gradle
  2. 0 35
      build_engine.sh
  3. 0 21
      fix_engine.sh
  4. 0 16
      patches/jbullet_dependencies_version_missing.diff
  5. 0 1
      settings.gradle

+ 26 - 84
build.gradle

@@ -14,63 +14,17 @@ if (!hasProperty('mainClass')) {
 }
 
 repositories {
-    mavenLocal()
-    jcenter {
-        url "https://jcenter.bintray.com/"
-    }
-    mavenCentral()
-    maven {
-        url "http://updates.jmonkeyengine.org/maven/"
-    }
     maven {
         url "http://nifty-gui.sourceforge.net/nifty-maven-repo/"
     }
     maven { url "https://jitpack.io" }
-
-    // See Engine Commit caf91c47df2e5687b3e9ecf2009ee22014bf4ac1
-    flatDir {
-        dirs rootProject.file('lib')
+    maven {
+        url "https://maven.google.com/"
     }
+    mavenCentral()
+    jcenter() // because of 'com.simsilica:sim-math:1.4.1'
 }
 
-/*if (System.getenv('TRAVIS') != null) {
-    if (System.env.TRAVIS_TAG != null && System.env.TRAVIS_TAG != "") { // Strangely it has to be both, because it's sometimes set as TRAVIS_TAG="" when we're in travis but no tag is set
-        // v3.3.0-stable-sdk1 becomes 3.3.0-stable
-        // Intentionally not using lastIndexOf here, we want the second "-".
-        ext.jmeEngineVersion = System.env.TRAVIS_TAG.substring(1, System.env.TRAVIS_TAG.indexOf("-", System.env.TRAVIS_TAG.indexOf("-") + 1));
-    } else {
-        if (System.env.TRAVIS_PULL_REQUEST == null || System.env.TRAVIS_PULL_REQUEST == "" || System.env.TRAVIS_PULL_REQUEST == "false") {
-			if (System.env.TRAVIS_BRANCH == "master") {
-				ext.jmeEngineVersion = "3.3.0-SNAPSHOT" // Manually update
-			} else {
-				ext.jmeEngineVersion = "3.3.0-" + System.env.TRAVIS_BRANCH + "-SNAPSHOT" // Manually update
-			}
-        } else {
-            ext.jmeEngineVersion = "3.3.0-" + System.env.TRAVIS_PULL_REQUEST_BRANCH + "-pr-" + System.env.TRAVIS_PULL_REQUEST + "-SNAPSHOT"
-        }
-    }
-} else {
-	new ByteArrayOutputStream().withStream { os ->
-		def result = exec {
-			executable = 'git'
-			args = ['rev-parse', '--abbrev-ref', 'HEAD'];
-			standardOutput = os
-		}
-		ext.branch = os.toString().trim()
-	}
-	
-	// If the Branch isn't master, specify the branch name.
-	// @TODO: One could use the same technique like the engine (grgit?)
-	if (ext.branch == "master") {
-		ext.branchSpec = ""
-	} else {
-		ext.branchSpec = "-" + ext.branch;
-	}
-	
-	// This is the engine version that will be used per default on every regular commit
-	ext.jmeEngineVersion = "3.3.0" + ext.branchSpec + "-SNAPSHOT"
-}*/
-
 configurations {
     corelibs
     optlibs
@@ -84,50 +38,38 @@ dependencies {
     corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.1", true, true)
     corelibs dep("javax.help:javahelp:2.0.05", false, false)
 
-    corelibs dep("org.jmonkeyengine:jme3-core", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-desktop", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-lwjgl", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-effects", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-blender", false, false)
-
-    corelibs dep("org.jmonkeyengine:jme3-bullet", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-bullet-native", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-core:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
+    optlibs dep("com.github.stephengold:Minie:4.6.0", false, false) // replacement for bullet-native
     corelibs dep(fileTree("lib"), false, false)
-    corelibs dep("org.jmonkeyengine:jme3-jogg", false, false)
-
-    corelibs dep("org.jmonkeyengine:jme3-networking", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-niftygui", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-plugins", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-terrain", false, false)
-
-    optlibs dep("org.jmonkeyengine:jme3-jbullet", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-ios", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android-native", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-lwjgl3", false, false)
-    optlibs dep("com.github.stephengold:Heart:6.0.0", false, false)
-    optlibs dep("com.github.stephengold:Minie:3.0.0", false, false)
-    optlibs dep("com.github.stephengold:Wes:0.6.0", false, false)
-    testdatalibs dep("org.jmonkeyengine:jme3-testdata", false, false)
-
-    examplelibs dep("org.jmonkeyengine:jme3-examples", false, false)
-
+    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.0-stable", true, true)
+
+    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.0-stable", false, false)
+
+    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.0-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android:3.4.0-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.0-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.0-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.0-stable", false, false)
+    optlibs dep("com.github.stephengold:Heart:7.1.0", false, false)
+    optlibs dep("com.github.stephengold:Wes:0.6.7", false, false)
+    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.0-stable", false, false)
+    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.0-stable", false, false)
 }
 
 def dep(coords, javadoc = false, sources = false) {
-
     def result = [dependencies.create(coords)]
-
     if (javadoc) result << dependencies.create("$coords:javadoc")
-
     if (sources) result << dependencies.create("$coords:sources")
-
     result
-
 }
 
-
-
 artifacts {
     //    jar null
 }

+ 0 - 35
build_engine.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-# This Shell Script will build and use the latest jMonkeyEngine git version, so there might be some undiscovered engine bugs, watch out!
-# Also if you want to revert to releases and bintray builds, you need to uninstall them from your local maven repo...
-
-if [ ! -d "engine" ]; then
-    echo "Downloading the Engine, this may take some time"
-    if [ "x$TRAVIS" != "x" ] && [ "x$TRAVIS_TAG" != "x" ]; then
-        # Extract the engine version from the sdk branch tag.
-        git clone -b $(echo "$TRAVIS_TAG" | sed -n 's/\(v.\+\)-sdk.\+/\1/p') --single-branch --depth 10 https://github.com/jMonkeyEngine/jMonkeyEngine/ engine # single-branch requires git > 1.7.10, if you see an error, just leave it out.
-    else
-        git clone -b master --single-branch --depth 10 https://github.com/jMonkeyEngine/jMonkeyEngine/ engine # single-branch requires git > 1.7.10, if you see an error, just leave it out.
-    fi
-    cd engine
-else
-    echo "Engine already cloned, pulling updates."
-    cd engine
-    git pull
-fi
-# git checkout tags/v3.1.0-beta2 # To use this, leave out depth and change -b to a branch.
-
-#echo "Patching the Engine...."
-#patch -s -N -p 1 < ../patches/FixHWSkinningSerialization.diff
-
-# Remark: We don't build the engine from here anymore but instead use https://docs.gradle.org/current/userguide/composite_builds.html,
-# that way we don't have to care about versioning and don't spam the user's mavenLocal Repo. Also you only need this script really to
-# download the engine. Nothing a windows user couldn't do by hand.
-
-# Until https://github.com/jMonkeyEngine/jmonkeyengine/issues/1260 is solved, prebuild the engine manually
-echo "Prebuilding the engine to ensure native libraries are unzipped"
-./gradlew -PbuildJavaDoc=true build assemble
-
-#echo "Building the Engine and installing them to your local maven repo...."
-# ./gradlew -PbuildJavaDoc=true install # Depends on jarJavadoc, jarSourcecode, assemble, dist etc.
-
-cd ../

+ 0 - 21
fix_engine.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-sdk=`pwd`
-
-#echo "Patching the jme3-jbullet POM file"
-#pushd ~/.m2/repository/org/jmonkeyengine/jme3-jbullet/ > /dev/null
-#for d in *; do
-#  if [ -d "$d" ]; then
-#    pushd $d > /dev/null
-#    mv jme3-jbullet-$d.pom jbullet.pom
-#    patch < "$sdk/patches/jbullet_dependencies_version_missing.diff"
-#    mv jbullet.pom jme3-jbullet-$d.pom
-#    popd > /dev/null
-#  fi
-#done
-#popd > /dev/null
-
-echo "Installing our local jbullet.jar and stack-alloc.jar into the maven local repository"
-pushd lib > /dev/null
-mvn install:install-file -Dfile=jbullet.jar -DgroupId=jbullet -DartifactId=jbullet -Dversion=0.0.1 -Dpackaging=jar
-mvn install:install-file -Dfile=stack-alloc.jar -DgroupId=stack-alloc -DartifactId=stack-alloc -Dversion=0.0.1 -Dpackaging=jar
-popd > /dev/null

+ 0 - 16
patches/jbullet_dependencies_version_missing.diff

@@ -1,16 +0,0 @@
---- jbullet.pom.old 2017-12-25 11:09:55.814731762 +0000
-+++ jbullet.pom     2017-12-25 11:09:27.535527327 +0000
-@@ -37,11 +37,13 @@
-     <dependency>
-       <groupId>jbullet</groupId>
-       <artifactId>jbullet</artifactId>
-+      <version>0.0.1</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>stack-alloc</groupId>
-       <artifactId>stack-alloc</artifactId>
-+      <version>0.0.1</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency> 

+ 0 - 1
settings.gradle

@@ -1,2 +1 @@
 rootProject.name = 'sdk'
-includeBuild './engine'