Merge pull request #13 from lrytz/merge-212-213

Merge 212 213

Author: lrytz

.gitignore

@@ -1,3 +1,3 @@
-target
-/sandbox
-/ivy2
+target/
+/sandbox/
+/ivy2/

project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.13.13

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

run-locally

@@ -2,23 +2,21 @@
 
 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
 
 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

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
 

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()