Skip to content

Commit

Permalink
Merge pull request #165 from guardrail-dev/bumping
Browse files Browse the repository at this point in the history
Bumping libs
  • Loading branch information
blast-hardcheese authored Mar 30, 2022
2 parents 7092833 + c914585 commit 9a4744a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 13 deletions.
21 changes: 10 additions & 11 deletions modules/core/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@ addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")

// Dependencies
libraryDependencies ++= Seq(
"dev.guardrail" %% "guardrail" % "0.69.0",
"dev.guardrail" %% "guardrail-core" % "0.68.1",
"dev.guardrail" %% "guardrail-java-support" % "0.67.2",
"dev.guardrail" %% "guardrail-scala-support" % "0.68.1",
"dev.guardrail" %% "guardrail" % "0.70.0",
"dev.guardrail" %% "guardrail-core" % "0.69.0",
"dev.guardrail" %% "guardrail-java-support" % "0.68.0",
"dev.guardrail" %% "guardrail-scala-support" % "0.69.0",

// Pending removal, before we hit 1.0.0, as per https://github.com/guardrail-dev/guardrail/issues/1195
"dev.guardrail" %% "guardrail-java-async-http" % "0.67.1",
"dev.guardrail" %% "guardrail-java-dropwizard" % "0.67.1",
"dev.guardrail" %% "guardrail-java-spring-mvc" % "0.67.1",
"dev.guardrail" %% "guardrail-scala-akka-http" % "0.69.0",
"dev.guardrail" %% "guardrail-scala-dropwizard" % "0.67.1",
"dev.guardrail" %% "guardrail-scala-endpoints" % "0.67.1",
"dev.guardrail" %% "guardrail-scala-http4s" % "0.69.0"
"dev.guardrail" %% "guardrail-java-async-http" % "0.68.0",
"dev.guardrail" %% "guardrail-java-dropwizard" % "0.68.0",
"dev.guardrail" %% "guardrail-java-spring-mvc" % "0.68.0",
"dev.guardrail" %% "guardrail-scala-akka-http" % "0.70.0",
"dev.guardrail" %% "guardrail-scala-dropwizard" % "0.68.0",
"dev.guardrail" %% "guardrail-scala-http4s" % "0.70.0"
)

buildInfoKeys := Seq[BuildInfoKey](organization, version)
Expand Down
3 changes: 2 additions & 1 deletion src/sbt-test/sbt-guardrail/java-codegen-app/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ libraryDependencies ++= Seq(
"org.asynchttpclient" % "async-http-client" % "2.10.4",
"javax.annotation" % "javax.annotation-api" % javaxAnnotationVersion, // for jdk11
"javax.xml.bind" % "jaxb-api" % "2.3.1",
"org.scalatest" %% "scalatest" % "3.0.8" % "test"
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2",
"org.scalatest" %% "scalatest" % "3.0.8" % Test
)
Original file line number Diff line number Diff line change
@@ -1,10 +1,40 @@
package helloworld

import scala.compat.java8.FutureConverters._
import scala.concurrent.Future

import com.example.clients.petstore.user.UserClient
import org.asynchttpclient.Response

object Hello {
def resp(code: (Int, String)): Response = new Response {
def getContentType(): String = null
def getCookies(): java.util.List[io.netty.handler.codec.http.cookie.Cookie] = null
def getHeader(x$1: CharSequence): String = null
def getHeaders(): io.netty.handler.codec.http.HttpHeaders = null
def getHeaders(x$1: CharSequence): java.util.List[String] = null
def getLocalAddress(): java.net.SocketAddress = null
def getRemoteAddress(): java.net.SocketAddress = null
def getResponseBody(): String = null
def getResponseBody(x$1: java.nio.charset.Charset): String = null
def getResponseBodyAsByteBuffer(): java.nio.ByteBuffer = null
def getResponseBodyAsBytes(): Array[Byte] = null
def getResponseBodyAsStream(): java.io.InputStream = null
def getStatusCode(): Int = code._1
def getStatusText(): String = code._2
def getUri(): org.asynchttpclient.uri.Uri = null
def hasResponseBody(): Boolean = false
def hasResponseHeaders(): Boolean = false
def hasResponseStatus(): Boolean = true
def isRedirected(): Boolean = false
}

def buildUserClient = {
new UserClient.Builder().build
new UserClient.Builder()
.withHttpClient( req =>
Future.successful(resp((302, "Found"))).toJava
)
.build()
}

}

0 comments on commit 9a4744a

Please sign in to comment.