Commit ba11bea

committed

Revert "Merge pull request #118 from alonsodomin/native"

This reverts commit fd760fc, reversing changes made to 615b70f. Conflicts: build.sbt project/plugins.sbt

1 parent 1f108e5 commit ba11beaCopy full SHA for ba11bea

File tree

5 files changed

-62

lines changed

.travis.yml
admin
- setup_travis.sh
build.sbt
native/src/main/scala/scala/util/parsing/input
- PositionCache.scala
project
- plugins.sbt

5 files changed

-62

lines changed

`‎.travis.yml‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`language: scala`
`2`	`2`
`3`		`-dist: trusty`
`4`		`-`
`5`		`-sudo: required`
`6`		`-`
`7`	`3`	`addons:`
`8`	`4`	`apt:`
`9`	`5`	`packages:`
`@@ -15,7 +11,6 @@ before_install:`
`15`	`11`	`- sed -e "s/^\$127\\.0\\.0\\.1.*\$/\1円 $(hostname \| cut -c1-63)/" /etc/hosts > /tmp/hosts`
`16`	`12`	`- sudo mv /tmp/hosts /etc/hosts`
`17`	`13`	`- cat /etc/hosts # optionally check the content after`
`18`		`- - admin/setup_travis.sh`
`19`	`14`
`20`	`15`	`env:`
`21`	`16`	`global:`

`‎admin/setup_travis.sh‎`

Lines changed: 0 additions & 22 deletions

This file was deleted.

`‎build.sbt‎`

Lines changed: 4 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import ScalaModulePlugin._`
`2`		`-import sbtcrossproject.{crossProject, CrossType}`
`3`	`2`
`4`	`3`	`scalaVersionsByJvm in ThisBuild := {`
`5`	`4`	`val v211 = "2.11.11"`
`@@ -15,11 +14,12 @@ scalaVersionsByJvm in ThisBuild := {`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`lazy val root = project.in(file("."))`
`18`		- .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)
	`17`	+ .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`)
`19`	`18`	`.settings(disablePublishing)`
`20`	`19`
`21`		-lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file(".")).
	`20`	+lazy val `scala-parser-combinators` = crossProject.in(file(".")).
`22`	`21`	`settings(scalaModuleSettings: _*).`
	`22`	`+ jvmSettings(scalaModuleSettingsJVM).`
`23`	`23`	`settings(`
`24`	`24`	`name := "scala-parser-combinators",`
`25`	`25`	`version := "1.0.7-SNAPSHOT",`
@@ -40,10 +40,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
`40`	`40`	`version.value`
`41`	`41`	`)`
`42`	`42`	`).`
`43`		`- jvmSettings(scalaModuleSettingsJVM).`
`44`	`43`	`jvmSettings(`
`45`		`- // Mima uses the name of the jvm project in the artifactId`
`46`		`- // when resolving previous versions (so no "-jvm" project)`
`47`	`44`	`OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),`
`48`	`45`	`libraryDependencies += "junit" % "junit" % "4.12" % "test",`
`49`	`46`	`libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"`
@@ -52,18 +49,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
`52`	`49`	`// Scala.js cannot run forked tests`
`53`	`50`	`fork in Test := false`
`54`	`51`	`).`
`55`		`- jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).`
`56`		`- nativeSettings(`
`57`		`- scalaVersion := "2.11.11",`
`58`		`- skip in compile := System.getProperty("java.version").startsWith("1.6"),`
`59`		`- test := {},`
`60`		`- libraryDependencies := {`
`61`		`- if (!scalaVersion.value.startsWith("2.11"))`
`62`		`- libraryDependencies.value.filterNot(_.organization == "org.scala-native")`
`63`		`- else libraryDependencies.value`
`64`		`- }`
`65`		`- )`
	`52`	`+ jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))`
`66`	`53`
`67`	`54`	lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm
`68`	`55`	lazy val `scala-parser-combinatorsJS` = `scala-parser-combinators`.js
`69`		-lazy val `scala-parser-combinatorsNative` = `scala-parser-combinators`.native

`‎native/src/main/scala/scala/util/parsing/input/PositionCache.scala‎`

Lines changed: 0 additions & 14 deletions

This file was deleted.

`‎project/plugins.sbt‎`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")`
`2`	`2`
`3`	`3`	`addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")`
`4`		`-addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.2")`
`5`		`-addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.2")`
`6`		`-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.3")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ba11bea

File tree

5 files changed

5 files changed

`‎.travis.yml‎`

`‎admin/setup_travis.sh‎`

`‎build.sbt‎`

`‎native/src/main/scala/scala/util/parsing/input/PositionCache.scala‎`

`‎project/plugins.sbt‎`

0 commit comments