diff --git a/.gitignore b/.gitignore index 01843dd..12d17bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -target -/sandbox -/ivy2 +target/ +/sandbox/ +/ivy2/ diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..27e88aa --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.13 diff --git a/repositories b/repositories new file mode 100644 index 0000000..de99506 --- /dev/null +++ b/repositories @@ -0,0 +1,6 @@ +[repositories] + plugins: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] + scala-integration: https://scala-ci.typesafe.com/artifactory/scala-integration/ + typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + maven-central + local \ No newline at end of file diff --git a/run-locally b/run-locally index 45c8196..07eaae3 100755 --- a/run-locally +++ b/run-locally @@ -2,16 +2,14 @@ scriptDir="$( cd "$( dirname "$0" )" && pwd )" -# put some recent nightly from https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/ -version=2.11.2-854de2d-nightly -repositoriesFile=$scriptDir/../jenkins-scripts/repositories-scala-release - -[[ -e $repositoriesFile ]] || { - echo "repos file does not exist $repositoriesFile" - exit 1 +function latestNightly() { + >&2 echo "No Scala version specified. Using latest nightly." + url='https://scala-ci.typesafe.com/job/scala-2.13.x-integrate-bootstrap/lastSuccessfulBuild/artifact/jenkins.properties/*view*/' + curl -f -s -L $url | grep ^version= | cut -d= -f2 } -cat $repositoriesFile +export version=${version-`latestNightly`} +echo "Scala version:" $version rm -rf $scriptDir/ivy2 @@ -19,6 +17,6 @@ sbt \ -Dsbt.log.noformat=true \ -Dsbt.ivy.home=$scriptDir/ivy2 \ -Dsbt.override.build.repos=true \ - -Dsbt.repository.config=$repositoriesFile \ + -Dsbt.repository.config=repositories \ -Dproject.version=$version \ clean run diff --git a/scripts/jobs/release/smoketest b/scripts/jobs/release/smoketest index 7929e8e..7a47a5f 100755 --- a/scripts/jobs/release/smoketest +++ b/scripts/jobs/release/smoketest @@ -4,10 +4,10 @@ rm -rf $WORKSPACE/ivy2 -releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-release-temp/"} +integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"} sbt -Dsbt.log.noformat=true -Dsbt.ivy.home=$WORKSPACE/ivy2 \ - "set resolvers += \"private-repo\" at \"$releaseTempRepoUrl\"" \ + "set resolvers += \"scala-integration\" at \"$integrationRepoUrl\"" \ $sbtDistVersionOverride \ clean run @@ -18,7 +18,7 @@ rm -rf sandbox mkdir sandbox cd sandbox -url="http://downloads.typesafe.com/scala/$version" +url="http://downloads.lightbend.com/scala/$version" wget -nv -O scala-$version.tgz $url/scala-$version.tgz tar xzvf scala-$version.tgz diff --git a/src/main/scala/scaladist/Main.scala b/src/main/scala/scaladist/Main.scala index 598da2a..46ed37c 100644 --- a/src/main/scala/scaladist/Main.scala +++ b/src/main/scala/scaladist/Main.scala @@ -1,6 +1,9 @@ package scaladist +import scala.util.Properties.versionString + object Main extends App { + println(s"scala.util.Properties.versionString: $versionString") XmlTest.test() SwingTest.test() ParserCombinatorsTest.test()