Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fix amalgamation and dep upgrades #1150

Merged
merged 10 commits into from
Mar 8, 2023
Merged

Build fix amalgamation and dep upgrades #1150

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8466797
update to java 17 for GHA
breedx-splk Mar 7, 2023
88b8ce0
upgrade gradle to 8.0.2
breedx-splk Mar 8, 2023
6ef4f72
upgrade nexus publish
breedx-splk Mar 8, 2023
8fd5d7c
upgrade shadow jar version
breedx-splk Mar 8, 2023
f7c4aa3
update protobuf-bom
breedx-splk Mar 8, 2023
cae1fcf
update proto
breedx-splk Mar 8, 2023
66aa297
Update buildSrc/build.gradle.kts
breedx-splk Mar 8, 2023
d225d4e
revert
breedx-splk Mar 8, 2023
4afe16c
Remove test sets plugin
Mar 8, 2023
1165d18
fix khttp test
Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -59,11 +59,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -84,11 +84,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down Expand Up @@ -122,11 +122,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -34,11 +34,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -59,11 +59,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down Expand Up @@ -97,11 +97,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -56,11 +56,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand All @@ -81,11 +81,11 @@ jobs:
- name: Check out repository
uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down Expand Up @@ -119,11 +119,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Set up JDK 11 for running Gradle
- name: Set up JDK 17 for running Gradle
uses: actions/[email protected]
with:
distribution: adopt
java-version: 11.0.11+9
distribution: temurin
java-version: 17

- name: Cache Gradle Wrapper
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ dependencies {
implementation("io.spring.gradle:dependency-management-plugin:1.1.0")

// keep these versions in sync with settings.gradle.kts
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
breedx-splk marked this conversation as resolved.
Show resolved Hide resolved
}
16 changes: 13 additions & 3 deletions buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,21 @@ repositories {
}
}
evaluationDependsOn(":dependencyManagement")
val dependencyManagementConf = configurations.create("dependencyManagement") {
isCanBeConsumed = false
isCanBeResolved = false
isVisible = false
}
afterEvaluate {
configurations.configureEach {
if (isCanBeResolved && !isCanBeConsumed) {
extendsFrom(dependencyManagementConf)
}
}
}

dependencies {
for (conf in configurations) {
add(conf.name, platform(project(":dependencyManagement")))
}
add(dependencyManagementConf.name, platform(project(":dependencyManagement")))
add("testImplementation", "org.assertj:assertj-core")
add("testImplementation", "org.awaitility:awaitility")
add("testImplementation", "org.mockito:mockito-core")
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {

// BOMs
api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.14.2"))
api(enforcedPlatform("com.google.protobuf:protobuf-bom:3.21.12"))
api(enforcedPlatform("com.google.protobuf:protobuf-bom:3.22.0"))
api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
api(enforcedPlatform("io.grpc:grpc-bom:1.53.0"))
api(platform("io.micrometer:micrometer-bom:$micrometerVersion"))
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion profiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("com.google.protobuf") version "0.9.2"
}

val protobufVersion = "3.21.12"
val protobufVersion = "3.22.0"

protobuf {
protoc {
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pluginManagement {
plugins {
id("com.bmuschko.docker-remote-api") version "9.2.1"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
id("com.github.johnrengelman.shadow") version "8.1.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("nebula.release") version "17.2.0"
id("org.unbroken-dome.test-sets") version "4.0.0"
}
Expand Down