Skip to content

Commit

Permalink
2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Katrix committed Dec 3, 2016
1 parent 41336ed commit 6b00f5b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ object HomeSweetHome {
}

@Plugin(id = LibPlugin.Id, name = LibPlugin.Name, version = HomeSweetHome.ConstantVersion, dependencies = Array(new Dependency(
id = LibKatLibPlugin.Id)))
id = LibKatLibPlugin.Id, version = KatLib.ConstantVersion)))
class HomeSweetHome @Inject()(logger: Logger, @ConfigDir(sharedRoot = false) cfgDir: Path, spongeContainer: PluginContainer)
extends ImplKatPlugin(logger, cfgDir, spongeContainer) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object HomeSweetHome {
}

@Plugin(id = LibPlugin.Id, name = LibPlugin.Name, version = HomeSweetHome.ConstantVersion, dependencies = Array(new Dependency(
id = LibKatLibPlugin.Id)))
id = LibKatLibPlugin.Id, version = KatLib.ConstantVersion)))
class HomeSweetHome @Inject()(logger: Logger, @ConfigDir(sharedRoot = false) cfgDir: Path, spongeContainer: PluginContainer)
extends ImplKatPlugin(logger, cfgDir, spongeContainer) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object HomeSweetHome {
}

@Plugin(id = LibPlugin.Id, name = LibPlugin.Name, version = HomeSweetHome.ConstantVersion, dependencies = Array(new Dependency(
id = LibKatLibPlugin.Id)))
id = LibKatLibPlugin.Id, version = KatLib.ConstantVersion)))
class HomeSweetHome @Inject()(logger: Logger, @ConfigDir(sharedRoot = false) cfgDir: Path, spongeContainer: PluginContainer)
extends ImplKatPlugin(logger, cfgDir, spongeContainer) {

Expand Down
9 changes: 6 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def removeSnapshot(str: String): String = if(str.endsWith("-SNAPSHOT")) str.substring(0, str.length - 9) else str
def katLibDependecy(module: String) = "com.github.Katrix-.KatLib" % s"katlib-$module" % "d3733ebd4e" % Provided //d3733ebd4e is the same as 2.0.0 with the resolver added to the plugins
def katLibDependecy(module: String) = "com.github.Katrix-.KatLib" % s"katlib-$module" % "2.0.1" % Provided

lazy val commonSettings = Seq(
name := s"HomeSweetHome-${removeSnapshot(spongeApiVersion.value)}",
Expand Down Expand Up @@ -29,7 +29,10 @@ lazy val commonSettings = Seq(
name = Some("HomeSweetHome"),
version = Some(s"${removeSnapshot(spongeApiVersion.value)}-${version.value}"),
authors = Seq("Katrix"),
dependencies = Set(DependencyInfo("spongeapi", Some(removeSnapshot(spongeApiVersion.value))))
dependencies = Set(
DependencyInfo("spongeapi", Some(removeSnapshot(spongeApiVersion.value))),
DependencyInfo("katlib", Some(s"2.0.1-${removeSnapshot(spongeApiVersion.value)}"))
)
)
)

Expand Down Expand Up @@ -71,4 +74,4 @@ lazy val homeV600 = (project in file("6.0.0"))
libraryDependencies += katLibDependecy("6-0-0")
)

lazy val homeRoot = project in file(".") settings (publishArtifact := false) disablePlugins AssemblyPlugin aggregate(homeV410, homeV500)
lazy val homeRoot = project in file(".") settings (publishArtifact := false) disablePlugins AssemblyPlugin aggregate(homeV410, homeV500, homeV600)

0 comments on commit 6b00f5b

Please sign in to comment.