Skip to content

Commit

Permalink
Upgrade dependencies (#33)
Browse files Browse the repository at this point in the history 
* Upgrade dependencies

* Fix ReadMe.md

* Fix CEL eval
  • Loading branch information
@devkanro
devkanro authored Jun 23, 2020
1 parent 0954725 commit 65a3d4f
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 43 deletions.
20 changes: 10 additions & 10 deletions ReadMe.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
We use [gradle.properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) to configure global settings of Sisyphus and all Sisyphus projects.

```properties
# [DEV,PROD] Set developer name for developing environment.
# [DEV,RT] Set developer name for developing environment.
sisyphus.developer=higan

# Use 'sisyphus.repository.<name>.url' Register maven repository for Sisyphus usage.
# [DEV,PROD] Url of repository named 'snapshot'.
# [DEV,RT] Url of repository named 'snapshot'.
sisyphus.repositories.snapshot.url=https://repo1.maven.org/maven2/
# [DEV,PROD] Optional, user name of repository.
# [DEV,RT] Optional, user name of repository.
sisyphus.repositories.snapshot.username=
# [DEV,PROD] Optional, password of repository.
# [DEV,RT] Optional, password of repository.
sisyphus.repositories.snapshot.password=

# Repositories for different usage, there are 4 embedded repositories.
# 'local'(maven local), 'central'(maven central), 'jcenter', 'portal'(gradle portal).

# [DEV,PROD] Repositories for resolving dependencies, default value is 'local,central,jcenter,portal'.
# [DEV,RT] Repositories for resolving dependencies, default value is 'local,central,jcenter,portal'.
sisyphus.dependency.repositories=local,central,jcenter,portal
# [DEV] Repositories for snapshot publishing, default value is 'snapshot'.
sisyphus.snapshot.repositories=snapshot
Expand All @@ -76,13 +76,13 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
# [DEV] Repositories for docker publishing.
sisyphus.docker.repositories=

# [PROD] Configuration artifacts, it will be resolved in runtime.
# [RT] Configuration artifacts, it will be resolved in runtime.
sisyphus.config.artifacts=foo.bar:baz:1.0.0
```

> **[DEV]** for developing environment properties.
>
> **[PROD]** for production runtime environment properties.
> **[RT]** for runtime environment properties.
`gradle.properties` are shared between Gradle and Spring. Sisyphus Project Plugin will load them and configure Gradle automatically. Sisyphus Configuration Artifact will load them for Spring Framework.

Expand All @@ -95,7 +95,7 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
```kotlin
plugins {
`java-library` // We build this project as a java library.
kotlin // Use the kotlin plugin to compile .kt files
kotlin("jvm") version "1.3.72" // Use the kotlin plugin to compile .kt files
id("com.bybutter.sisyphus.project") version "0.0.3" // Use the sisyphus project management plugin.
id("com.bybutter.sisyphus.protobuf") version "0.0.3" // Use the sisyphus protobuf compiler plugin.
}
Expand Down Expand Up @@ -155,7 +155,7 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
```kotlin
plugins {
`java-library`
kotlin
kotlin("jvm") version "1.3.72"
id("com.bybutter.sisyphus.project") version "0.0.3"
}

Expand Down Expand Up @@ -201,7 +201,7 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
```kotlin
plugins {
application
kotlin
kotlin("jvm") version "1.3.72"
`kotlin-spring`
id("com.bybutter.sisyphus.project") version "0.0.3"
}
Expand Down
20 changes: 10 additions & 10 deletions dependencies/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,44 @@ javaPlatform {

dependencies {
api(platform(project(":sisyphus-bom")))
api(platform("org.springframework.boot:spring-boot-dependencies:2.3.0.RELEASE"))
api(platform("org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE"))
api(platform("io.micrometer:micrometer-bom:1.5.1"))
api(platform("org.jetbrains.kotlin:kotlin-bom:1.3.72"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.7"))
api(platform("org.apache.maven:maven:3.6.3"))
api(platform("io.grpc:grpc-bom:1.29.0"))
api(platform("com.google.protobuf:protobuf-bom:3.12.1"))
api(platform("io.grpc:grpc-bom:1.30.0"))
api(platform("com.google.protobuf:protobuf-bom:3.12.2"))

constraints {
api("com.squareup:kotlinpoet:1.5.0")
api("com.squareup:kotlinpoet:1.6.0")
api("org.elasticsearch.client:transport:5.6.3")
api("com.aliyun.hbase:alihbase-client:2.8.0")
api("org.reflections:reflections:0.9.12")
api("com.github.os72:protoc-jar:3.11.4")
api("io.netty:netty-tcnative-boringssl-static:2.0.30.Final")
api("io.kubernetes:client-java:8.0.2")
api("io.netty:netty-tcnative-boringssl-static:2.0.31.Final")
api("org.apache.maven.wagon:wagon-http:3.4.0")
api("org.junit.jupiter:junit-jupiter:5.6.2")
api("org.reflections:reflections:0.9.12")
api("com.squareup.okhttp3:okhttp:4.7.2")
api("com.squareup.retrofit2:retrofit:2.9.0")
api("io.github.resilience4j:resilience4j-retrofit:1.4.0")
api("io.github.resilience4j:resilience4j-retrofit:1.5.0")
api("org.antlr:antlr4:4.8")
api("io.swagger.core.v3:swagger-core:2.1.2")
api("org.jooq:jooq:3.13.2")
api("com.google.api.grpc:proto-google-common-protos:1.18.0")
api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
api("org.jetbrains.kotlin:kotlin-allopen:1.3.72")
api("org.springframework.boot:spring-boot-gradle-plugin:2.3.0.RELEASE")
api("org.springframework.boot:spring-boot-gradle-plugin:2.3.1.RELEASE")
api("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
api("com.github.ben-manes:gradle-versions-plugin:0.28.0")
api("com.netflix.nebula:nebula-publishing-plugin:17.2.1")
api("com.netflix.nebula:nebula-publishing-plugin:17.3.0")
api("com.netflix.nebula:gradle-contacts-plugin:5.1.0")
api("com.netflix.nebula:gradle-info-plugin:7.1.4")
api("org.gradle.kotlin:plugins:1.3.6")
api("com.gradle.publish:plugin-publish-plugin:0.11.0")
api("com.gradle.publish:plugin-publish-plugin:0.12.0")
api("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
api("com.palantir.gradle.docker:gradle-docker:0.25.0")
api("io.grpc:grpc-kotlin-stub:0.1.2")
api("io.grpc:grpc-kotlin-stub:0.1.3")
}
}
4 changes: 2 additions & 2 deletions lib/sisyphus-grpc/src/main/kotlin/com/bybutter/sisyphus/cel/CelContext.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class CelContext internal constructor(private val engine: CelEngine, global: Map
var result = visit(and.e)

for (relation in and.e1) {
if (result == true) break
if (result == false) break
result = and(result, relation)
}

Expand Down Expand Up @@ -200,7 +200,7 @@ class CelContext internal constructor(private val engine: CelEngine, global: Map
fun visit(literal: CelParser.LiteralContext): Any? {
return when (literal) {
is CelParser.IntContext -> literal.text.toLong()
is CelParser.UintContext -> literal.text.toULong()
is CelParser.UintContext -> literal.text.substring(0, literal.text.length - 1).toULong()
is CelParser.DoubleContext -> literal.text.toDouble()
is CelParser.StringContext -> celString(literal.text)
is CelParser.BytesContext -> celBytes(literal.text)
Expand Down
14 changes: 3 additions & 11 deletions ...rc/main/kotlin/com/bybutter/sisyphus/starter/grpc/support/reflection/ReflectionService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,14 @@ import com.bybutter.sisyphus.starter.grpc.support.reflection.v1.ServerReflection
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1.ServerReflectionRequest
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1.ServerReflectionResponse
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1.ServiceResponse
import io.grpc.InternalNotifyOnServerBuild
import io.grpc.Server
import io.grpc.ServerServiceDefinition
import io.grpc.InternalServer
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow

@OptIn(ExperimentalCoroutinesApi::class)
class ReflectionService : ServerReflection(), InternalNotifyOnServerBuild {
private lateinit var services: List<ServerServiceDefinition>

override fun notifyOnBuild(server: Server) {
services = server.services
}

class ReflectionService : ServerReflection() {
override fun serverReflectionInfo(input: Flow<ServerReflectionRequest>): Flow<ServerReflectionResponse> = flow {
input.collect { request ->
val response = ServerReflectionResponse {
Expand Down Expand Up @@ -87,7 +79,7 @@ class ReflectionService : ServerReflection(), InternalNotifyOnServerBuild {

private fun listService(name: String): ServerReflectionResponse.MessageResponse.ListServicesResponse {
return ServerReflectionResponse.MessageResponse.ListServicesResponse(ListServiceResponse {
this.service += services.map {
this.service += InternalServer.SERVER_CONTEXT_KEY.get().services.map {
ServiceResponse {
this.name = it.serviceDescriptor.name
}
Expand Down
13 changes: 3 additions & 10 deletions ...in/kotlin/com/bybutter/sisyphus/starter/grpc/support/reflection/ReflectionServiceAlpha.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,14 @@ import com.bybutter.sisyphus.starter.grpc.support.reflection.v1alpha.ServerRefle
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1alpha.ServerReflectionRequest
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1alpha.ServerReflectionResponse
import com.bybutter.sisyphus.starter.grpc.support.reflection.v1alpha.ServiceResponse
import io.grpc.InternalNotifyOnServerBuild
import io.grpc.Server
import io.grpc.ServerServiceDefinition
import io.grpc.InternalServer
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow

@OptIn(ExperimentalCoroutinesApi::class)
class ReflectionServiceAlpha : ServerReflection(), InternalNotifyOnServerBuild {
private lateinit var services: List<ServerServiceDefinition>

override fun notifyOnBuild(server: Server) {
services = server.services
}
class ReflectionServiceAlpha : ServerReflection() {

override fun serverReflectionInfo(input: Flow<ServerReflectionRequest>): Flow<ServerReflectionResponse> = flow {
input.collect { request ->
Expand Down Expand Up @@ -87,7 +80,7 @@ class ReflectionServiceAlpha : ServerReflection(), InternalNotifyOnServerBuild {

private fun listService(name: String): ServerReflectionResponse.MessageResponse.ListServicesResponse {
return ServerReflectionResponse.MessageResponse.ListServicesResponse(ListServiceResponse {
this.service += services.map {
this.service += InternalServer.SERVER_CONTEXT_KEY.get().services.map {
ServiceResponse {
this.name = it.serviceDescriptor.name
}
Expand Down

0 comments on commit 65a3d4f

Please sign in to comment.