From 1da9b50a93ab81f4a2b941384061b8610a54dbdd Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Thu, 22 Dec 2022 17:19:24 -0800 Subject: [PATCH 1/5] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 882136c2..7b57320b 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ scalaVersion := "2.12.10" scalacOptions += "-Xsource:2.11" -libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.2.+" +libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT" publishMavenStyle := true From 6f3b6282418d740804dd3e4629bea29d3c4072bb Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Thu, 22 Dec 2022 17:47:32 -0800 Subject: [PATCH 2/5] use a modern build.sbt --- build.sbt | 82 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/build.sbt b/build.sbt index 7b57320b..45e60160 100644 --- a/build.sbt +++ b/build.sbt @@ -2,45 +2,53 @@ organization := "edu.berkeley.cs" version := "1.0-SNAPSHOT" -name := "testchipip" scalaVersion := "2.12.10" scalacOptions += "-Xsource:2.11" -libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT" - -publishMavenStyle := true - -publishArtifact in Test := false - -pomIncludeRepository := { x => false } - -pomExtra := https://github.com/ucb-bar/testchipip - - - BSD-style - http://www.opensource.org/licenses/bsd-license.php - repo - - - - https://github.com/ucb-bar/testchipip.git - scm:git:github.com/ucb-bar/testchipip.git - - -publishTo := { - val v = version.value - val nexus = "https://oss.sonatype.org/" - if (v.trim.endsWith("SNAPSHOT")) { - Some("snapshots" at nexus + "content/repositories/snapshots") - } - else { - Some("releases" at nexus + "service/local/staging/deploy/maven2") - } -} - -resolvers ++= Seq( - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases"), - Resolver.mavenLocal) +lazy val root = (project in file ".")) + .dependsOn(sifiveblocks) + .settings( + name := "testchipip" + libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT" + + publishMavenStyle := true + + publishArtifact in Test := false + + pomIncludeRepository := { x => false } + + pomExtra := https://github.com/ucb-bar/testchipip + + + BSD-style + http://www.opensource.org/licenses/bsd-license.php + repo + + + + https://github.com/ucb-bar/testchipip.git + scm:git:github.com/ucb-bar/testchipip.git + + + publishTo := { + val v = version.value + val nexus = "https://oss.sonatype.org/" + if (v.trim.endsWith("SNAPSHOT")) { + Some("snapshots" at nexus + "content/repositories/snapshots") + } + else { + Some("releases" at nexus + "service/local/staging/deploy/maven2") + } + } + + resolvers ++= Seq( + Resolver.sonatypeRepo("snapshots"), + Resolver.sonatypeRepo("releases"), + Resolver.mavenLocal) + ) + +lazy val sifiveblocks = RootProject(uri("https://github.com/sifive/sifive-blocks.git")) + + From 37c2e5efbdffbbbdefe0e5d52d6e2f9c0b4745ee Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Thu, 22 Dec 2022 17:48:20 -0800 Subject: [PATCH 3/5] move around --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 45e60160..818546ca 100644 --- a/build.sbt +++ b/build.sbt @@ -6,6 +6,7 @@ version := "1.0-SNAPSHOT" scalaVersion := "2.12.10" scalacOptions += "-Xsource:2.11" +lazy val sifiveblocks = RootProject(uri("https://github.com/sifive/sifive-blocks.git")) lazy val root = (project in file ".")) .dependsOn(sifiveblocks) @@ -49,6 +50,5 @@ lazy val root = (project in file ".")) Resolver.mavenLocal) ) -lazy val sifiveblocks = RootProject(uri("https://github.com/sifive/sifive-blocks.git")) From a8c4627e4030c4da63ef28004aff95a9951bdc7d Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Fri, 23 Dec 2022 01:53:14 +0000 Subject: [PATCH 4/5] misc --- build.sbt | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 818546ca..aa42dd80 100644 --- a/build.sbt +++ b/build.sbt @@ -1,24 +1,21 @@ -organization := "edu.berkeley.cs" +ThisBuild / organization := "edu.berkeley.cs" +ThisBuild / version := "1.0-SNAPSHOT" +ThisBuild / scalaVersion := "2.12.10" -version := "1.0-SNAPSHOT" - - -scalaVersion := "2.12.10" - -scalacOptions += "-Xsource:2.11" lazy val sifiveblocks = RootProject(uri("https://github.com/sifive/sifive-blocks.git")) lazy val root = (project in file ".")) .dependsOn(sifiveblocks) .settings( - name := "testchipip" - libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT" + name := "testchipip", + scalacOptions += "-Xsource:2.11", + libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT", - publishMavenStyle := true + publishMavenStyle := true, - publishArtifact in Test := false + publishArtifact in Test := false, - pomIncludeRepository := { x => false } + pomIncludeRepository := { x => false }, pomExtra := https://github.com/ucb-bar/testchipip @@ -31,7 +28,7 @@ lazy val root = (project in file ".")) https://github.com/ucb-bar/testchipip.git scm:git:github.com/ucb-bar/testchipip.git - + , publishTo := { val v = version.value @@ -42,12 +39,12 @@ lazy val root = (project in file ".")) else { Some("releases" at nexus + "service/local/staging/deploy/maven2") } - } + }, resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), Resolver.sonatypeRepo("releases"), - Resolver.mavenLocal) + Resolver.mavenLocal), ) From 55e022e060f734eefcfde91a8210818b84fd18a0 Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Fri, 23 Dec 2022 01:59:44 +0000 Subject: [PATCH 5/5] chore: bump sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 0837f7a1..8b9a0b0a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.8.0