Skip to content

Commit 82c6b5c

Browse files
authored
build: Make scripted sbt plugin tests work locally (#2109)
1 parent 5634eac commit 82c6b5c

42 files changed

Lines changed: 66 additions & 1 deletion

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.sbt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ lazy val sbtPlugin = Project(id = "sbt-akka-grpc", base = file("sbt-plugin"))
120120
/** And for scripted tests: */
121121
scriptedLaunchOpts += ("-Dproject.version=" + version.value),
122122
scriptedLaunchOpts ++= sys.props.collect { case (k @ "sbt.ivy.home", v) => s"-D$k=$v" }.toSeq,
123+
scriptedLaunchOpts ++= {
124+
// pass along token repo to scripted test projects (scripted tests are isolated and not picking that up from
125+
// global sbt config)
126+
val akkaRepo = resolvers.value.collectFirst {
127+
case repo: MavenRepository if repo.root.contains("repo.akka.io") && repo.root.contains("secure") =>
128+
repo.root
129+
}
130+
akkaRepo.map(repo => s"-Dscripted.resolver=$repo")
131+
},
123132
scriptedDependencies := {
124133
val p1 = publishLocal.value
125134
val p2 = (codegen / publishLocal).value

sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
scalaVersion := "2.13.17"
22

3+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
4+
35
enablePlugins(AkkaGrpcPlugin)
46

57
javacOptions += "-Xdoclint:all"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
12
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version"))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
scalaVersion := "2.13.17"
22

3+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
4+
35
enablePlugins(AkkaGrpcPlugin)
46

57
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)

sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
12
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version"))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
scalaVersion := "2.13.17"
22

3+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
4+
35
enablePlugins(AkkaGrpcPlugin)
46

57
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
12
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version"))

sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
scalaVersion := "2.13.17"
22

3+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
4+
35
enablePlugins(AkkaGrpcPlugin)
46

57
javacOptions += "-Xdoclint:all"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
resolvers ++= sys.props.get("scripted.resolver").map(resolver => "Scripted Resolver".at(resolver))
12
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version"))

0 commit comments

Comments
 (0)