From a67461df7a37354e37d973f2738c797039123916 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Thu, 23 Apr 2020 16:29:36 -0700 Subject: [PATCH 1/2] [SBT] Quiet down jgit http warnings --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a30249c9..d8d00e35 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases")) (Resolver.ivyStylePatterns) resolvers += Classpaths.sbtPluginReleases -resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" +resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven" addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") From eeafc82d12c98111a2409f6f8d13fdd81e1a18e4 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Thu, 23 Apr 2020 16:28:56 -0700 Subject: [PATCH 2/2] Remove ++ per Jack's recommendation --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index c851cccf..80e10a0c 100644 --- a/variables.mk +++ b/variables.mk @@ -102,7 +102,7 @@ JAVA_ARGS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -XX:MaxPermSize=256M SCALA_VERSION=2.12.10 SCALA_VERSION_MAJOR=$(basename $(SCALA_VERSION)) -SBT ?= java $(JAVA_ARGS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar ++$(SCALA_VERSION) +SBT ?= java $(JAVA_ARGS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar ######################################################################################### # output directory for tests