From 455e8c7438c7d3a0d777f3c4014c5cf6cd30cc0c Mon Sep 17 00:00:00 2001 From: kobayasi Date: Thu, 20 Feb 2014 06:21:26 +0900 Subject: [PATCH] Release version 0.8.0 --- build.sbt | 4 ++-- engine/build.sbt | 6 +++--- gdx/build.sbt | 2 +- project/Common.scala | 8 +++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 9f27a6a13..1de0f9829 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project.in(file(".")) .settings(Common.settings: _*) - .aggregate(engine, desktop, android, gdx, niftygui) + .aggregate(engine, desktop/*, android*/, gdx/*, niftygui*/) ) lazy val engine = project @@ -12,7 +12,7 @@ lazy val android = project lazy val gdx = project.dependsOn(engine) -lazy val niftygui = project.dependsOn(engine) +//lazy val niftygui = project.dependsOn(engine) publishArtifact := false diff --git a/engine/build.sbt b/engine/build.sbt index 564ec78b4..f760eae68 100644 --- a/engine/build.sbt +++ b/engine/build.sbt @@ -24,12 +24,12 @@ unmanagedSourceDirectories in Compile := Seq( , baseDirectory.value / "src/ogre" , baseDirectory.value / "src/pack" , baseDirectory.value / "src/tools" - , baseDirectory.value / "src/terrain" +// , baseDirectory.value / "src/terrain" , baseDirectory.value / "src/xml" ) sources in Compile ~= { - dirs => dirs filter(file => (!file.getAbsolutePath.contains("cinematic"))) + dirs => dirs filter(file => (!file.getAbsolutePath.contains("cinematic") && !file.getAbsolutePath.contains("CollisionShapeFactory.java"))) } unmanagedResourceDirectories in Compile <<= unmanagedSourceDirectories in Compile @@ -44,7 +44,7 @@ libraryDependencies += "java3d" % "vecmath" % "1.3.1" libraryDependencies += "xpp3" % "xpp3" % "1.1.4c" -libraryDependencies += "com.jme3" % "noise" % "3.0.0-SNAPSHOT" +//libraryDependencies += "com.jme3" % "noise" % "3.0.0-SNAPSHOT" libraryDependencies += "net.sf.sociaal" % "j-ogg-oggd" % "3.0.0.20130526" diff --git a/gdx/build.sbt b/gdx/build.sbt index 2cf88e252..e47792303 100644 --- a/gdx/build.sbt +++ b/gdx/build.sbt @@ -3,5 +3,5 @@ Common.settings name := "mms-gdx" libraryDependencies ++= Seq( - "com.badlogicgames.gdx" % "gdx" % "1.0-SNAPSHOT" + "com.badlogicgames.gdx" % "gdx" % "0.9.9" ) \ No newline at end of file diff --git a/project/Common.scala b/project/Common.scala index fd76961ee..8cf6d07d1 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -4,7 +4,7 @@ import sbt.Keys._ object Common { lazy val settings = Seq( organization := "info.projectkyoto" - , version := "1.0.0-SNAPSHOT" + , version := "0.8.0" // , homepage := Some(url("https://github.com/chototsu/MikuMikuStudio")) , startYear := Some(2010) , description := "A game engine compatible with MikuMikuDance." @@ -13,8 +13,8 @@ object Common { , crossPaths := false , javacOptions ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6") , javacOptions in doc := Seq("-locale", "en_US", "-encoding", "UTF-8", "-source", "1.6") - , resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots" - , resolvers += "nifty-maven-repo.sourceforge.net" at "http://nifty-gui.sourceforge.net/nifty-maven-repo" +// , resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots" +// , resolvers += "nifty-maven-repo.sourceforge.net" at "http://nifty-gui.sourceforge.net/nifty-maven-repo" , pomExtra := ( https://github.com/chototsu/MikuMikuStudio @@ -44,6 +44,8 @@ object Common { Some("releases" at nexus + "service/local/staging/deploy/maven2") } , publishArtifact in Test := false + , pomIncludeRepository := { _ => false } + ) } -- 2.11.0