Commit 7a33c774 authored by Juste Raimbault's avatar Juste Raimbault
Browse files

[Lib] Switch from spatialdata to spatialsampling

parent 48f07079
......@@ -242,16 +242,15 @@ lazy val container = OsgiProject(dir, "container", exports = Seq("container.*"),
//libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.3-1",
version := containerVersion) dependsOn(cats, squants, circe, shapeless) settings(settings: _*)
lazy val spatialdataVersion = "0.2"
lazy val spatialsamplingVersion = "0.1"
lazy val spatialdata = OsgiProject(dir, "org.openmole.spatialdata",
exports = Seq("org.openmole.spatialdata.*"),
lazy val spatialdata = OsgiProject(dir, "org.openmole.spatialsampling",
exports = Seq("org.openmole.spatialsampling.*"),
privatePackages = Seq("!scala.*","!org.apache.commons.math3.*","*")
) settings(
resolvers += "osgeo" at "https://repo.osgeo.org/repository/release/",
libraryDependencies += "org.openmole.library" %% "spatialdata" % spatialdataVersion,
version := spatialdataVersion//,
//embeddedJars := (Keys.externalDependencyClasspath in Compile).value map (_.data) filter (f=> (f.getName startsWith "gt-")) // embed geotools jars
//resolvers += "osgeo" at "https://repo.osgeo.org/repository/release/",
libraryDependencies += "org.openmole.library" %% "spatialsampling" % spatialsamplingVersion,
version := spatialsamplingVersion
) settings(settings: _*)
lazy val opencsv = OsgiProject(dir, "au.com.bytecode.opencsv") settings(
......
......@@ -486,7 +486,6 @@ lazy val sensitivity = OsgiProject(pluginDir, "org.openmole.plugin.method.sensit
/* Sampling */
// FIXME problem with osgi bundling for spatialSampling
def allSampling = Seq(combineSampling, csvSampling,oneFactorSampling, lhsSampling, quasirandomSampling, spatialSampling)
lazy val combineSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampling.combine", imports = Seq("*")) dependsOn(exception, modifierDomain, collectionDomain, workflow) settings (pluginSettings: _*)
......@@ -506,7 +505,7 @@ lazy val quasirandomSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampl
lazy val spatialSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampling.spatial", imports = Seq("*")) dependsOn(exception, workflow, workspace) settings (
libraryDependencies += Libraries.math,
libraryDependencies += Libraries.spatialdata
libraryDependencies += Libraries.spatialsampling
) settings (pluginSettings: _*)
......
......@@ -32,7 +32,7 @@ object Libraries {
lazy val scalatraVersion = "2.7.0-RC1"
lazy val scalaURIVersion = "1.1.1"
lazy val scoptVersion = "3.7.1"
lazy val spatialdataVersion = "0.2"
lazy val spatialsamplingVersion = "0.1"
lazy val bootstrapnative = libraryDependencies += "fr.iscpif.scaladget" %%% "bootstrapnative" % scaladgetVersion
lazy val lunr = libraryDependencies += "fr.iscpif.scaladget" %%% "lunr" % scaladgetVersion
......@@ -105,7 +105,7 @@ object Libraries {
lazy val netlogo6 = "org.openmole.library" % "ccl-northwestern-edu-netlogo6" % netLogo6Version
lazy val sourceCode = "org.openmole.library" %% "sourcecode" % sourcecodeVersion
lazy val txtmark = "org.openmole.library" %% "com-github-rjeschke-txtmark" % "0.13"
lazy val spatialdata = "org.openmole.library" %% "org-openmole-spatialdata" % spatialdataVersion
lazy val spatialsampling = "org.openmole.library" %% "org-openmole-spatialsampling" % spatialsamplingVersion
lazy val xzJava = "org.openmole.library" %% "xzjava" % "1.8"
def httpClientVersion = "4.5.3"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment