Permalink
Browse files

Published for 2.10.1, bumped ICU.

  • Loading branch information...
1 parent 8f23ff6 commit c63be6399fd551ccade187096ddfe0e5f53cd2aa @melezov committed Apr 3, 2013
View
@@ -2,18 +2,18 @@ organization := "hr.element.etb"
name := "etb-slug"
-version := "0.0.2"
+version := "0.0.3"
// ### Build settings ###
libraryDependencies ++= Seq(
- "com.ibm.icu" % "icu4j" % "49.1"
-, "org.scalatest" %% "scalatest" % "1.7.1" % "test"
+ "com.ibm.icu" % "icu4j" % "51.1"
+, "org.scalatest" %% "scalatest" % "2.0.M5b" % "test"
)
-crossScalaVersions := Seq("2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
+crossScalaVersions := Seq("2.10.1", "2.9.3", "2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
-scalaVersion <<= (crossScalaVersions)(_.head)
+scalaVersion <<= crossScalaVersions(_.head)
scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "UTF-8", "-optimise")
@@ -24,13 +24,13 @@ unmanagedSourceDirectories in Test <<= (scalaSource in Test )( _ :: Nil)
// ### Publishing ###
-publishTo := Some("Element Releases" at "http://maven.element.hr/nexus/content/repositories/releases/")
+publishTo := Some("Element Releases" at "http://repo.element.hr/nexus/content/repositories/releases/")
-credentials += Credentials(Path.userHome / ".publish" / "element.credentials")
+credentials += Credentials(Path.userHome / ".config" / "Sluggifier_master" / "nexus.config")
publishArtifact in (Compile, packageDoc) := false
// ### Misc ###
-//initialCommands := "import hr.element.doit.slug._"
+initialCommands := "import hr.element.doit.slug._"
View
@@ -0,0 +1,4 @@
+@echo off
+
+echo Cross-publishing the project ...
+call "%~dp0sbt.bat" --no-jrebel %* clean +compile +publish
View
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo Cross-publishing the project ...
+`dirname $0`/sbt.sh --no-jrebel "$@" clean +compile +publish
View
@@ -2,4 +2,4 @@
echo Performing dependency update for all projects ...
echo Will also create Eclipse .project and .classpath files ...
-call "%~dp0\sbt.bat" --no-jrebel %* update eclipse
+call "%~dp0sbt.bat" --no-jrebel %* update eclipse
View
@@ -0,0 +1 @@
+sbt.version=0.12.3-RC2
View
@@ -1,3 +1,15 @@
+resolvers := Seq(
+ "Element Nexus" at "http://repo.element.hr/nexus/content/groups/public/"
+, Resolver.url("Element Nexus (Ivy)",
+ url("http://repo.element.hr/nexus/content/groups/public/"))(Resolver.ivyStylePatterns)
+)
+
+externalResolvers <<= resolvers map { r =>
+ Resolver.withDefaultResolvers(r, mavenCentral = false)
+}
+
+// =======================================================================================
+
// +-------------------------------------------------------------------------------------+
// | SBT Eclipse (https://github.com/typesafehub/sbteclipse) |
// | Creates .project and .classpath files for easy Eclipse project imports |
@@ -6,6 +18,11 @@
// | See also: Scala IDE downloads (http://download.scala-ide.org/) |
// +-------------------------------------------------------------------------------------+
-resolvers += Classpaths.typesafeResolver
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
+
+// +-------------------------------------------------------------------------------------+
+// | Dependency graph SBT plugin (https://github.com/jrudolph/sbt-dependency-graph) |
+// | Lists all library dependencies in a nicely formatted way for easy inspection. |
+// +-------------------------------------------------------------------------------------+
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.1")
View
@@ -0,0 +1 @@
+sbt-launch-*.jar
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,27 @@
+[scala]
+ version: ${sbt.scala.version-auto}
+
+[app]
+ org: ${sbt.organization-org.scala-sbt}
+ name: sbt
+ version: ${sbt.version-read(sbt.version)[0.12.2]}
+ class: ${sbt.main.class-sbt.xMain}
+ components: xsbti,extra
+ cross-versioned: ${sbt.cross.versioned-false}
+
+[repositories]
+ local
+ element-repo-maven: http://repo.element.hr/nexus/content/groups/public/
+ element-repo-ivy: http://repo.element.hr/nexus/content/groups/public/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+
+[boot]
+ directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
+
+[ivy]
+ ivy-home: ../.ivy2/Sluggifier
+ checksums: ${sbt.checksums-sha1,md5}
+ override-build-repos: ${sbt.override.build.repos-false}
+ repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}
+
+[log]
+ level: info
View
22 sbt.bat
@@ -3,9 +3,8 @@ setlocal
pushd
cd "%~dp0"
-set JVM_PARAMS=-Xss2m -Xmx712m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled
+set JVM_PARAMS=-Xss2m -Xms2g -Xmx2g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseNUMA -XX:+UseParallelGC -Dscalac.patmat.analysisBudget=off
-set LIFT_RUN_MODE=-Drun.mode=development
set TRY_JREBEL=true
set LOG_LEVEL=
set NO_PAUSE=false
@@ -14,33 +13,39 @@ set DO_LOOP=false
:PARSER_LOOP
if "%~1"=="" goto :PARSER_END
-if "%~1"=="--prod" (
- set LIFT_RUN_MODE=-Drun.mode=production
+if "%~1"=="--jvm" (
+ echo Setting JVM param [%~2]
+ set JVM_PARAMS=%JVM_PARAMS% -D%~2
+ shift
goto :PARSER_CONTINUE
)
if "%~1"=="--debug" (
+ echo "Setting debug mode"
set LOG_LEVEL="set logLevel:=Level.Debug"
goto :PARSER_CONTINUE
)
-if "%~1"=="~lift" (
- set SBT_PARAMS=%SBT_PARAMS% container:start ~compile container:stop
- set JREBEL_PLUGINS=%JREBEL_PLUGINS% -Drebel.lift_plugin=true
+if "%~1"=="--prod" (
+ echo Setting production mode
+ set LOG_LEVEL="set logLevel:=Level.Info"
goto :PARSER_CONTINUE
)
if "%~1"=="--no-jrebel" (
+ echo Disabling JRebel for faster compilation
set TRY_JREBEL=false
goto :PARSER_CONTINUE
)
if "%~1"=="--loop" (
+ echo Will run SBT in loop mode
set DO_LOOP=true
goto :PARSER_CONTINUE
)
if "%~1"=="--no-pause" (
+ echo Will not pause in loop mode
set NO_PAUSE=true
goto :PARSER_CONTINUE
)
@@ -52,12 +57,11 @@ shift
goto :PARSER_LOOP
:PARSER_END
-set JVM_PARAMS=%JVM_PARAMS% %LIFT_RUN_MODE%
if %TRY_JREBEL%.==true. (
if exist "%JREBEL_HOME%\jrebel.jar" set JVM_PARAMS=%JVM_PARAMS% -noverify -javaagent:"%JREBEL_HOME%\jrebel.jar" %JREBEL_PLUGINS%
)
-set GRUJ_PATH=project\strap\gruj_vs_sbt-launch-0.11.2.jar
+set GRUJ_PATH=project\strap\gruj_vs_sbt-launch-0.12.2.jar
set RUN_CMD=java %JVM_PARAMS% -jar %GRUJ_PATH% %LOG_LEVEL% %SBT_PARAMS%
:RUN_LOOP
View
64 sbt.sh
@@ -1,2 +1,64 @@
#!/bin/bash
-java -jar project/strap/sbt-launch-0.11.2.jar
+cd `dirname $0`
+
+## START JVM PARAMS
+JVM_PARAMS="-Xss2m -Xms2g -Xmx2g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseNUMA -XX:+UseParallelGC -Dscalac.patmat.analysisBudget=off"
+
+TRY_JREBEL=true
+LOG_LEVEL=
+NO_PAUSE=false
+DO_LOOP=false
+
+while [ -n "$*" ]
+do
+ case "$1" in
+ "--debug")
+ echo "Setting debug mode"
+ LOG_LEVEL="\"set logLevel:=Level.Debug\""
+ ;;
+ "--prod")
+ echo "Setting production mode"
+ LOG_LEVEL="\"set logLevel:=Level.Info\""
+ ;;
+ "--no-jrebel")
+ echo "Disabling JRebel for faster compilation"
+ TRY_JREBEL=false
+ ;;
+ "--loop")
+ echo "Will run SBT in loop mode"
+ DO_LOOP=true
+ ;;
+ "--no-pause")
+ echo "Will not pause in loop mode"
+ NO_PAUSE=true
+ ;;
+ *)
+ SBT_PARAMS="$SBT_PARAMS \"$1\""
+ ;;
+ esac
+ shift
+
+done
+
+JVM_PARAMS="$JVM_PARAMS $LIFT_RUN_MODE"
+if $TRY_JREBEL && [ -n "$JREBEL_HOME" ] && [ -f $JREBEL_HOME/jrebel.jar ]; then
+ JVM_PARAMS="$JVM_PARAMS -noverify -javaagent:$JREBEL_HOME/jrebel.jar $JREBEL_PLUGINS"
+fi
+
+GRUJ_PATH="project/strap/gruj_vs_sbt-launch-0.12.2.jar"
+RUN_CMD="java $JVM_PARAMS -jar $GRUJ_PATH $LOG_LEVEL $SBT_PARAMS"
+
+LOOPING=true
+while $LOOPING
+do
+ eval "$RUN_CMD"
+
+ if ! $DO_LOOP ; then
+ LOOPING=false
+ else
+ if ! $NO_PAUSE ; then
+ echo "Press Enter to continue or Press CTRL+C to exit!"
+ read
+ fi
+ fi
+done
@@ -46,4 +46,4 @@ case class SMSifier (transRules: String, replacement: String) {
def apply(text: String) = {
(transliterate andThen trim andThen trimWhiteSpaceToOne andThen sanitize)(text)
}
-}
+}
@@ -38,5 +38,4 @@ class SMSSpec extends FeatureSpec with GivenWhenThen with MustMatchers{
out must equal (res)
}
}
-
-}
+}
View
0 test-loop.sh 100644 → 100755
No changes.

0 comments on commit c63be63

Please sign in to comment.