Skip to content

Commit bd08616

Browse files
authored
Merge pull request #26 from sourceplusplus/bump
Bump
2 parents af95048 + d25b29e commit bd08616

File tree

10 files changed

+15
-215
lines changed

10 files changed

+15
-215
lines changed

build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
val cliGroup: String by project
12-
val cliVersion: String by project
12+
val projectVersion: String by project
1313
val jacksonVersion: String by project
1414
val apolloVersion: String by project
1515
val commonsLang3Version: String by project
@@ -18,11 +18,10 @@ val bouncycastleVersion: String by project
1818
val jupiterVersion: String by project
1919
val commonsIoVersion: String by project
2020
val auth0JwtVersion: String by project
21-
val protocolVersion: String by project
2221
val vertxVersion: String by project
2322

2423
group = cliGroup
25-
version = cliVersion
24+
version = projectVersion
2625

2726
repositories {
2827
mavenCentral()
@@ -33,7 +32,7 @@ dependencies {
3332
implementation("com.apollographql.apollo3:apollo-runtime:$apolloVersion")
3433
api("com.apollographql.apollo3:apollo-api:$apolloVersion")
3534

36-
implementation("com.github.sourceplusplus.protocol:protocol:$protocolVersion")
35+
implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion")
3736

3837
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
3938
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
@@ -85,7 +84,7 @@ configurations {
8584

8685
nativeImage {
8786
dependsOn("shadowJar")
88-
setClasspath(File(project.buildDir, "libs/spp-cli-$version.jar"))
87+
setClasspath(File(project.buildDir, "libs/spp-cli-$projectVersion.jar"))
8988
runtimeClasspath = configurations.getByName("empty")
9089
if (System.getenv("GRAALVM_HOME") != null) {
9190
graalVmHome = System.getenv("GRAALVM_HOME")

config/spp-platform.crt

Lines changed: 0 additions & 29 deletions
This file was deleted.

config/spp-platform.key

Lines changed: 0 additions & 51 deletions
This file was deleted.

config/spp-platform.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

e2e/Dockerfile-spp-platform

Lines changed: 0 additions & 5 deletions
This file was deleted.

e2e/config/spp-platform.crt

Lines changed: 0 additions & 29 deletions
This file was deleted.

e2e/config/spp-platform.key

Lines changed: 0 additions & 51 deletions
This file was deleted.

e2e/config/spp-platform.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

e2e/docker-compose.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
version: '3.3'
22
services:
33
spp-platform:
4-
build:
5-
context: .
6-
dockerfile: Dockerfile-spp-platform
4+
image: sourceplusplus/spp-platform:latest
75
container_name: spp-platform
86
hostname: spp-platform
97
ports:
@@ -12,3 +10,11 @@ services:
1210
- "5455:5455"
1311
environment:
1412
- SPP_DISABLE_JWT=true
13+
skywalking-oap:
14+
image: sourceplusplus/spp-oap-server:latest
15+
container_name: skywalking-oap
16+
hostname: skywalking-oap
17+
environment:
18+
- SPP_PLATFORM_HOST=spp-platform
19+
- SPP_PLATFORM_PORT=5460
20+
- SPP_PLATFORM_SSL_TRUST_ALL=true

gradle.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
kotlin.code.style=official
22

3-
cliGroup = com.sourceplusplus
4-
cliVersion = 0.2.3
5-
6-
protocolVersion=0.2.9
3+
cliGroup=com.sourceplusplus
4+
projectVersion=0.3.0-alpha5
75

86
vertxVersion=4.2.2
97
graalVersion = 21.3.0

0 commit comments

Comments
 (0)