Skip to content

Commit

Permalink
pekko 1.0.0 release (#112)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jul 15, 2023
1 parent d4d2f4a commit 719d069
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 31 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")

// TODO remove these resolvers when we start using released Pekko jars
ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
ThisBuild / resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false)

val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen"
Expand Down
5 changes: 2 additions & 3 deletions plugin-tester-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@ pekkoGrpc {

repositories {
mavenLocal()
maven { url 'https://repository.apache.org/content/groups/staging/' } // TODO remove this resolver when we start using released Pekko jars
}

def scalaFullVersion = "2.12.18"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"

dependencies {
implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4456-9a4c0fc7-SNAPSHOT'
implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
implementation "org.scala-lang:scala-library:${scalaFullVersion}"
testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3"
testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
}
8 changes: 1 addition & 7 deletions plugin-tester-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<pekko.http.version>0.0.0+4456-9a4c0fc7-SNAPSHOT</pekko.http.version>
<pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
<grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
Expand All @@ -26,12 +26,6 @@
<name>Apache Snapshots Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</repository>
<!-- TODO remove this resolver when we start using released Pekko jars -->
<repository>
<id>apache-staging</id>
<name>Apache Staging Repository</name>
<url>https://repository.apache.org/content/groups/staging/</url>
</repository>
</repositories>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions plugin-tester-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@ pekkoGrpc {

repositories {
mavenLocal()
maven { url 'https://repository.apache.org/content/groups/staging/' } // TODO remove this resolver when we start using released Pekko jars
}

def scalaFullVersion = "2.12.18"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"

dependencies {
implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4456-9a4c0fc7-SNAPSHOT'
implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
implementation "org.scala-lang:scala-library:${scalaFullVersion}"
testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3"
testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
}
10 changes: 2 additions & 8 deletions plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<pekko.version>1.0.0-RC3</pekko.version>
<pekko.http.version>0.0.0+4456-9a4c0fc7-SNAPSHOT</pekko.http.version>
<pekko.version>1.0.0</pekko.version>
<pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
<grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
Expand All @@ -25,12 +25,6 @@
<name>Apache Snapshots Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</repository>
<!-- TODO remove this resolver when we start using released Pekko jars -->
<repository>
<id>apache-staging</id>
<name>Apache Staging Repository</name>
<url>https://repository.apache.org/content/groups/staging/</url>
</repository>
</repositories>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ object Dependencies {
// We don't force Pekko updates because downstream projects can upgrade
// themselves. For more information see
// https://pekko.apache.org//docs/pekko/current/project/downstream-upgrade-strategy.html
val pekko = "1.0.0-RC3"
val pekko = "1.0.0"
val pekkoBinary = "current"
val pekkoHttp = "0.0.0+4456-9a4c0fc7-SNAPSHOT"
val pekkoHttp = "0.0.0+4468-963bd592-SNAPSHOT"
val pekkoHttpBinary = "current"

val grpc = "1.48.1" // checked synced by VersionSyncCheckPlugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

enablePlugins(PekkoGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

enablePlugins(PekkoGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

enablePlugins(PekkoGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

enablePlugins(PekkoGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

enablePlugins(PekkoGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ scalaVersion := "2.12.18"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

organization := "org.apache.pekko"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ scalaVersion := "3.3.0"

// TODO remove these resolvers when we start using released Pekko jars
resolvers += Resolver.ApacheMavenSnapshotsRepo
resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")

scalacOptions += "-Xfatal-warnings"

Expand Down

0 comments on commit 719d069

Please sign in to comment.