Skip to content

Commit

Permalink
Merge pull request #1 from cloudstateio/master
Browse files Browse the repository at this point in the history
Pull in upstream
  • Loading branch information
rasummer authored Mar 24, 2020
2 parents 7341b7e + c994cb0 commit 2936572
Show file tree
Hide file tree
Showing 36 changed files with 1,724 additions and 1,097 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ jobs:
name: graal build
command: |
export PATH="~/graal/graalvm-ce-java11-19.3.0/bin:$PATH"
sbt "project proxy-core" "set graalVMVersion := None" graalvm-native-image:packageBin
# disabling scalaformating, observed some incompatibilities between graalvm version and scalafmt version.
sbt "project proxy-core" "set graalVMVersion := None" "set scalafmtOnCompile := false" graalvm-native-image:packageBin
no_output_timeout: 60m

graalvm_it_test:
Expand All @@ -156,9 +157,10 @@ jobs:
workflows:
version: 2
build:
jobs:
- graalvm_local_build
# Disabling build as it requires resource_class : large machine.
# build:
# jobs:
# - graalvm_local_build
test:
jobs:
- it_test
Expand Down
34 changes: 17 additions & 17 deletions README.md

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ name := "cloudstate"

val GrpcJavaVersion = "1.22.1"
val GraalAkkaVersion = "0.4.1"
val AkkaVersion = "2.5.26"
val AkkaVersion = "2.5.29"
val AkkaHttpVersion = "10.1.11"
val AkkaManagementVersion = "1.0.5"
val AkkaPersistenceCassandraVersion = "0.102"
Expand Down Expand Up @@ -188,7 +188,8 @@ lazy val docs = (project in file("docs"))
"cloudstate.java-support.version" -> "0.4.3",
"cloudstate.node-support.version" -> "0.0.1",
"cloudstate.go-support.version" -> "0.1.0",
"cloudstate.go.version" -> "1.13"
"cloudstate.go.version" -> "1.13",
"cloudstate.kotlin-support.version" -> "0.4.3"
),
paradoxNavigationDepth := 3,
inConfig(Test)(
Expand Down Expand Up @@ -235,7 +236,7 @@ def dockerSettings: Seq[Setting[_]] = Seq(
def buildProxyHelp(commandName: String, name: String) =
Help(
(s"$commandName <task>",
s"Execute the given docker scoped task (eg, publishLocal or publish) for the the $name build of the proxy.")
s"Execute the given docker scoped task (eg, publishLocal or publish) for the $name build of the proxy.")
)

def buildProxyCommand(commandName: String,
Expand Down
Loading

0 comments on commit 2936572

Please sign in to comment.