aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Pretty <jon.pretty@propensive.com>2018-01-27 18:00:29 +0000
committerJon Pretty <jon.pretty@propensive.com>2018-01-27 18:00:29 +0000
commit097f5aeebdcc350f91e37a05ca36ae9c6f27f04e (patch)
treeec4dd86f4e74f098baabe593763acb40774f58b5
parent4fe64bd5ba7bdc1ea0e29923b27463c62a3c4052 (diff)
downloadmagnolia-097f5aeebdcc350f91e37a05ca36ae9c6f27f04e.tar.gz
magnolia-097f5aeebdcc350f91e37a05ca36ae9c6f27f04e.tar.bz2
magnolia-097f5aeebdcc350f91e37a05ca36ae9c6f27f04e.zip
Cleaned up
-rw-r--r--build.sbt104
-rwxr-xr-xbuild.sh11
-rw-r--r--project/build.properties1
-rw-r--r--project/plugins.sbt5
-rw-r--r--src/core/globalutil.scala (renamed from core/shared/src/main/scala/globalutil.scala)0
-rw-r--r--src/core/interface.scala (renamed from core/shared/src/main/scala/interface.scala)0
-rw-r--r--src/core/magnolia.scala (renamed from core/shared/src/main/scala/magnolia.scala)0
-rw-r--r--src/examples/decode.scala (renamed from examples/shared/src/main/scala/decode.scala)0
-rw-r--r--src/examples/default.scala (renamed from examples/shared/src/main/scala/default.scala)0
-rw-r--r--src/examples/eq.scala (renamed from examples/shared/src/main/scala/eq.scala)0
-rw-r--r--src/examples/patch.scala (renamed from examples/shared/src/main/scala/patch.scala)0
-rw-r--r--src/examples/show.scala (renamed from examples/shared/src/main/scala/show.scala)0
-rw-r--r--src/examples/typename.scala (renamed from examples/shared/src/main/scala/typename.scala)0
-rw-r--r--src/tests/tests.scala (renamed from tests/src/main/scala/tests.scala)0
-rw-r--r--tests/lib/2.11/contextual-data_2.11-1.1.0.jarbin168497 -> 0 bytes
-rw-r--r--tests/lib/2.11/contextual_2.11-1.1.0.jarbin57393 -> 0 bytes
-rw-r--r--tests/lib/2.11/estrapade-macros_2.11-1.0.3.jarbin32679 -> 0 bytes
-rw-r--r--tests/lib/2.11/estrapade_2.11-1.0.3.jarbin109001 -> 0 bytes
-rw-r--r--tests/lib/2.12/contextual-data_2.12-1.1.0.jarbin149330 -> 0 bytes
-rw-r--r--tests/lib/2.12/contextual_2.12-1.1.0.jarbin48727 -> 0 bytes
-rw-r--r--tests/lib/2.12/estrapade-macros_2.12-1.0.3.jarbin26140 -> 0 bytes
-rw-r--r--tests/lib/2.12/estrapade_2.12-1.0.3.jarbin79193 -> 0 bytes
22 files changed, 0 insertions, 121 deletions
diff --git a/build.sbt b/build.sbt
deleted file mode 100644
index 178ac83..0000000
--- a/build.sbt
+++ /dev/null
@@ -1,104 +0,0 @@
-import com.typesafe.sbt.pgp.PgpKeys.publishSigned
-
-lazy val core = crossProject
- .in(file("core"))
- .settings(buildSettings: _*)
- .settings(publishSettings: _*)
- .settings(scalaMacroDependencies: _*)
- .settings(moduleName := "magnolia")
-
-lazy val coreJVM = core.jvm
-lazy val coreJS = core.js
-
-lazy val examples = crossProject
- .in(file("examples"))
- .settings(buildSettings: _*)
- .settings(publishSettings: _*)
- .settings(moduleName := "magnolia-examples")
- .dependsOn(core)
-
-lazy val examplesJVM = examples.jvm
-lazy val examplesJS = examples.js
-
-lazy val tests = project
- .in(file("tests"))
- .settings(buildSettings: _*)
- .settings(unmanagedSettings)
- .settings(moduleName := "magnolia-tests")
- .settings(
- addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
- libraryDependencies ++= Seq(
- "com.fommil" %% "deriving-macro" % "0.9.0",
- "com.fommil" %% "scalaz-deriving" % "0.9.0"
- )
- )
- .dependsOn(examplesJVM)
-
-lazy val benchmarks = project
- .in(file("benchmarks"))
- .settings(buildSettings: _*)
- .settings(moduleName := "magnolia-benchmarks")
- .dependsOn(examplesJVM)
-
-lazy val buildSettings = Seq(
- organization := "com.propensive",
- scalaVersion := "2.12.4",
- name := "magnolia",
- version := "0.6.1",
- scalacOptions ++= Seq(
- "-deprecation",
- "-feature",
- "-Ywarn-value-discard",
- "-Ywarn-dead-code",
- "-Ywarn-nullary-unit",
- "-Ywarn-numeric-widen",
- "-Ywarn-inaccessible",
- "-Ywarn-adapted-args"
- ),
- scmInfo := Some(
- ScmInfo(url("https://github.com/propensive/magnolia"),
- "scm:git:git@github.com:propensive/magnolia.git")
- )
-)
-
-lazy val publishSettings = Seq(
- homepage := Some(url("http://magnolia.work/")),
- licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
- autoAPIMappings := true,
- publishMavenStyle := true,
- publishArtifact in Test := false,
- pomIncludeRepository := { _ =>
- false
- },
- publishTo := {
- val nexus = "https://oss.sonatype.org/"
- if (isSnapshot.value)
- Some("snapshots" at nexus + "content/repositories/snapshots")
- else
- Some("releases" at nexus + "service/local/staging/deploy/maven2")
- },
- pomExtra := (
- <developers>
- <developer>
- <id>propensive</id>
- <name>Jon Pretty</name>
- <url>https://github.com/propensive/magnolia/</url>
- </developer>
- </developers>
- )
-)
-
-import java.io.File
-
-lazy val unmanagedSettings = unmanagedBase := (scalaVersion.value
- .split("\\.")
- .map(_.toInt)
- .to[List] match {
- case List(2, 12, _) => baseDirectory.value / "lib" / "2.12"
- case List(2, 11, _) => baseDirectory.value / "lib" / "2.11"
-})
-
-lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq(
- libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
- libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-)
diff --git a/build.sh b/build.sh
deleted file mode 100755
index b556f81..0000000
--- a/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/zsh
-
-source ../build.zsh
-
-PROJECT=magnolia
-
-TEST_DEPENDENCIES=$PROJECT-core.jar:$PROJECT-examples.jar:../estrapade/estrapade-macros.jar:../estrapade/estrapade-core.jar:../contextual/contextual-core.jar:../contextual/contextual-data.jar
-build core && \
-build examples -cp $PROJECT-core.jar && \
-build tests -cp $TEST_DEPENDENCIES && \
-runtests tests -cp $TEST_DEPENDENCIES:$PROJECT-tests.jar
diff --git a/project/build.properties b/project/build.properties
deleted file mode 100644
index 9abea12..0000000
--- a/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.0.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
deleted file mode 100644
index 4a92b89..0000000
--- a/project/plugins.sbt
+++ /dev/null
@@ -1,5 +0,0 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
diff --git a/core/shared/src/main/scala/globalutil.scala b/src/core/globalutil.scala
index 5c11f79..5c11f79 100644
--- a/core/shared/src/main/scala/globalutil.scala
+++ b/src/core/globalutil.scala
diff --git a/core/shared/src/main/scala/interface.scala b/src/core/interface.scala
index 846eee9..846eee9 100644
--- a/core/shared/src/main/scala/interface.scala
+++ b/src/core/interface.scala
diff --git a/core/shared/src/main/scala/magnolia.scala b/src/core/magnolia.scala
index 5318aa2..5318aa2 100644
--- a/core/shared/src/main/scala/magnolia.scala
+++ b/src/core/magnolia.scala
diff --git a/examples/shared/src/main/scala/decode.scala b/src/examples/decode.scala
index 595ee6f..595ee6f 100644
--- a/examples/shared/src/main/scala/decode.scala
+++ b/src/examples/decode.scala
diff --git a/examples/shared/src/main/scala/default.scala b/src/examples/default.scala
index 4b781a5..4b781a5 100644
--- a/examples/shared/src/main/scala/default.scala
+++ b/src/examples/default.scala
diff --git a/examples/shared/src/main/scala/eq.scala b/src/examples/eq.scala
index 8ee42a4..8ee42a4 100644
--- a/examples/shared/src/main/scala/eq.scala
+++ b/src/examples/eq.scala
diff --git a/examples/shared/src/main/scala/patch.scala b/src/examples/patch.scala
index 769b214..769b214 100644
--- a/examples/shared/src/main/scala/patch.scala
+++ b/src/examples/patch.scala
diff --git a/examples/shared/src/main/scala/show.scala b/src/examples/show.scala
index 6f5838b..6f5838b 100644
--- a/examples/shared/src/main/scala/show.scala
+++ b/src/examples/show.scala
diff --git a/examples/shared/src/main/scala/typename.scala b/src/examples/typename.scala
index 2030cda..2030cda 100644
--- a/examples/shared/src/main/scala/typename.scala
+++ b/src/examples/typename.scala
diff --git a/tests/src/main/scala/tests.scala b/src/tests/tests.scala
index a311291..a311291 100644
--- a/tests/src/main/scala/tests.scala
+++ b/src/tests/tests.scala
diff --git a/tests/lib/2.11/contextual-data_2.11-1.1.0.jar b/tests/lib/2.11/contextual-data_2.11-1.1.0.jar
deleted file mode 100644
index 0324473..0000000
--- a/tests/lib/2.11/contextual-data_2.11-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.11/contextual_2.11-1.1.0.jar b/tests/lib/2.11/contextual_2.11-1.1.0.jar
deleted file mode 100644
index 0f10ba6..0000000
--- a/tests/lib/2.11/contextual_2.11-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar b/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar
deleted file mode 100644
index 3906f72..0000000
--- a/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.11/estrapade_2.11-1.0.3.jar b/tests/lib/2.11/estrapade_2.11-1.0.3.jar
deleted file mode 100644
index d0a3c0b..0000000
--- a/tests/lib/2.11/estrapade_2.11-1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.12/contextual-data_2.12-1.1.0.jar b/tests/lib/2.12/contextual-data_2.12-1.1.0.jar
deleted file mode 100644
index 9513196..0000000
--- a/tests/lib/2.12/contextual-data_2.12-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.12/contextual_2.12-1.1.0.jar b/tests/lib/2.12/contextual_2.12-1.1.0.jar
deleted file mode 100644
index c0aee69..0000000
--- a/tests/lib/2.12/contextual_2.12-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar b/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar
deleted file mode 100644
index 061da8d..0000000
--- a/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/lib/2.12/estrapade_2.12-1.0.3.jar b/tests/lib/2.12/estrapade_2.12-1.0.3.jar
deleted file mode 100644
index e6a365b..0000000
--- a/tests/lib/2.12/estrapade_2.12-1.0.3.jar
+++ /dev/null
Binary files differ