Updated: project config and build script / also new build status badg…

…es have been added to README.md
kevin-lee · Oct 25, 2019 · dae7464 · dae7464
1 parent 99a901f
commit dae7464
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/.github/workflows/sbt-build.sh b/.github/workflows/sbt-build.sh
@@ -6,20 +6,21 @@ if [ -z "$1" ]
   then
     echo "Scala version is missing. Please enter the Scala version."
     echo "sbt-build.sh 2.11.12"
+    exit 1
 else
-  scala_version=$1
+  SCALA_VERSION=$1
   echo "============================================"
   echo "Build projects"
   echo "--------------------------------------------"
   echo ""
   if [[ "$CI_BRANCH" == "master" || "$CI_BRANCH" == "release" ]]
   then
-    sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; jacoco"
-    sbt -d -J-Xmx2048m "; ++ ${scala_version}!; packagedArtifacts"
+    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; clean; jacoco"
+    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; packagedArtifacts"
   else
-    sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; jacoco; package"
+    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; clean; jacoco; package"
   fi
-  sbt -d -J-Xmx2048m "; ++ ${scala_version}!; jacocoCoveralls"
+  sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; jacocoCoveralls"
 
   echo "============================================"
   echo "Building projects: Done"

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # J8+ (J8Plus) - The Missing Functional Parts of Java 8
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/dfc5d723-b5a8-43fa-a8fb-97d28d556de7/442898/badge.svg)](https://semaphoreci.com/kevin-lee/j8plus)
+[![Build Status](https://github.com/Kevin-Lee/j8plus/workflows/Build/badge.svg)](https://github.com/Kevin-Lee/j8plus/actions?workflow=Build)
+[![Release Status](https://github.com/Kevin-Lee/j8plus/workflows/Release/badge.svg)](https://github.com/Kevin-Lee/j8plus/actions?workflow=Release) [![Coverage Status](https://coveralls.io/repos/Kevin-Lee/j8plus/badge.svg)](https://coveralls.io/r/Kevin-Lee/j8plus)
 
-[![Coverage Status](https://coveralls.io/repos/Kevin-Lee/j8plus/badge.svg)](https://coveralls.io/r/Kevin-Lee/j8plus)
 [ ![Download](https://api.bintray.com/packages/kevinlee/maven/j8plus/images/download.svg) ](https://bintray.com/kevinlee/maven/j8plus/_latestVersion)
 
 

diff --git a/build.sbt b/build.sbt
@@ -16,23 +16,18 @@ lazy val j8plus = (project in file("."))
   .enablePlugins(DevOopsGitReleasePlugin)
   .enablePlugins(JacocoCoverallsPlugin)
   .settings(
-    javacOptions in (Compile, compile) ++= List(
-      "-g",
-      "-deprecation"
+    javacOptions := Seq(
+      "-source", javaVersion.value
+    , "-encoding", "UTF-8"
+    )
+  , javacOptions ++= Seq(
+      "-g"
+    , "-deprecation"
+    )
+  , javacOptions in Compile ++= Seq(
+      "-target", javaVersion.value
+    , "-Xlint:unchecked"
     )
-  , javacOptions := {
-      def removeInvalidOptions(settings: Seq[String], acc: Seq[String]): Seq[String] = settings match {
-        case "-target" +: javaVersion +: rest =>
-          removeInvalidOptions(rest, acc)
-        case "-Xlint:unchecked" +: rest =>
-          removeInvalidOptions(rest, acc)
-        case x :: xs =>
-          removeInvalidOptions(xs, acc :+ x)
-        case Seq() =>
-          acc
-      }
-      removeInvalidOptions(javacOptions.value, Seq.empty)
-    }
   , resolvers ++= List(
       Resolver.jcenterRepo,
       "kevin-public-releases" at "https://repo.kevinlee.io/repository/kevin-public-releases",