Skip to content

Commit

Permalink
Dependency cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@slinkydeveloper
slinkydeveloper committed Dec 2, 2024
1 parent c06beb6 commit 8d737b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 85 deletions.
7 changes: 3 additions & 4 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
plugins {
id("com.github.jk1.dependency-license-report") version "2.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"

id("org.jetbrains.dokka") version "1.9.20"
alias(libs.plugins.dependency.license.report)
alias(libs.plugins.nexus.publish)
alias(libs.plugins.dokka)

// https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
id(libs.plugins.spotless.get().pluginId) apply false
Expand Down
8 changes: 3 additions & 5 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ksp = "2.0.21-1.0.28"
protobuf = "4.29.0"
opentelemetry = "1.44.1"
vertx = "4.5.11"
dokka = "1.9.20"
kotlinx-serialization = "1.7.3"
kotlinx-coroutines = "1.9.0"
junit = "5.10.2"
Expand All @@ -20,7 +19,6 @@ jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
jackson-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }
jackson-parameter-names = { module = "com.fasterxml.jackson.module:jackson-module-parameter-names", version.ref = "jackson" }
handlebars = "com.github.jknack:handlebars:4.3.1"
victools-jsonschema-generator = { module = "com.github.victools:jsonschema-generator", version.ref = "victools-json-schema" }
Expand All @@ -30,7 +28,6 @@ tink = "com.google.crypto.tink:tink:1.15.0"
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
jwt = "com.nimbusds:nimbus-jose-jwt:9.47"
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry" }
opentelemetry-kotlin = { module = "io.opentelemetry:opentelemetry-extension-kotlin", version.ref = "opentelemetry" }
Expand All @@ -44,6 +41,7 @@ log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "lo
tomcat-annotations = "org.apache.tomcat:annotations-api:6.0.53"
assertj = "org.assertj:assertj-core:3.26.0"
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
jspecify = "org.jspecify:jspecify:1.0.0"
Expand All @@ -62,9 +60,9 @@ jib = "com.google.cloud.tools.jib:3.2.1"
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
protobuf = "com.google.protobuf:0.9.4"
aggregate-javadoc = "io.freefair.aggregate-javadoc:8.6"
gradle-nexus-publish-plugin = "io.github.gradle-nexus.publish-plugin:1.3.0"
nexus-publish = "io.github.gradle-nexus.publish-plugin:1.3.0"
spring-dependency-management = "io.spring.dependency-management:1.1.6"
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
dokka = "org.jetbrains.dokka:1.9.20"
jsonschema2pojo = "org.jsonschema2pojo:1.2.1"
openapi-generator = "org.openapi.generator:7.5.0"
spotless = "com.diffplug.spotless:6.25.0"
77 changes: 1 addition & 76 deletions settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,79 +33,4 @@ include(
"sdk-aggregated-javadocs",
"test-services")

dependencyResolutionManagement {
repositories { mavenCentral() }

// versionCatalogs {
// create("coreLibs") {
// version("protobuf", "4.28.3")
// version("log4j", "2.24.1")
// version("opentelemetry", "1.44.1")
//
// library("protoc", "com.google.protobuf", "protoc").versionRef("protobuf")
// library("protobuf-java", "com.google.protobuf", "protobuf-java").versionRef("protobuf")
// library("protobuf-kotlin", "com.google.protobuf",
// "protobuf-kotlin").versionRef("protobuf")
//
// library("log4j-api", "org.apache.logging.log4j", "log4j-api").versionRef("log4j")
// library("log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
//
// library("opentelemetry-bom", "io.opentelemetry", "opentelemetry-bom")
// .versionRef("opentelemetry")
// library("opentelemetry-api", "io.opentelemetry", "opentelemetry-api").withoutVersion()
// library("opentelemetry-kotlin", "io.opentelemetry", "opentelemetry-extension-kotlin")
// .withoutVersion()
//
// library("jspecify", "org.jspecify", "jspecify").version("1.0.0")
//
// library("jwt", "com.nimbusds:nimbus-jose-jwt:9.47")
// library("tink", "com.google.crypto.tink:tink:1.15.0")
// }
// create("vertxLibs") {
// library("vertx-bom", "io.vertx:vertx-stack-depchain:4.5.11")
// library("vertx-core", "io.vertx", "vertx-core").withoutVersion()
// library("vertx-kotlin-coroutines", "io.vertx", "vertx-lang-kotlin-coroutines")
// .withoutVersion()
// library("vertx-junit5", "io.vertx", "vertx-junit5").withoutVersion()
// }
// create("lambdaLibs") {
// library("core", "com.amazonaws:aws-lambda-java-core:1.2.3")
// library("events", "com.amazonaws:aws-lambda-java-events:3.11.5")
// }
// create("kotlinLibs") {
// library("kotlinx-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core")
// .version("1.9.0")
// library("kotlinx-serialization-core", "org.jetbrains.kotlinx",
// "kotlinx-serialization-core")
// .version("1.7.3")
// library("kotlinx-serialization-json", "org.jetbrains.kotlinx",
// "kotlinx-serialization-json")
// .version("1.7.3")
//
// version("ksp", "2.0.21-1.0.28")
// library("symbol-processing-api", "com.google.devtools.ksp", "symbol-processing-api")
// .versionRef("ksp")
// plugin("ksp", "com.google.devtools.ksp").versionRef("ksp")
// }
// create("testingLibs") {
// version("junit-jupiter", "5.10.2")
// version("assertj", "3.26.0")
// version("testcontainers", "1.20.3")
//
// library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("junit-jupiter")
// library("junit-api", "org.junit.jupiter", "junit-jupiter-api").versionRef("junit-jupiter")
//
// library("assertj", "org.assertj", "assertj-core").versionRef("assertj")
//
// library("testcontainers-core", "org.testcontainers", "testcontainers")
// .versionRef("testcontainers")
// library("testcontainers-toxiproxy", "org.testcontainers", "toxiproxy")
// .versionRef("testcontainers")
// }
// create("pluginLibs") {
// plugin("spotless", "com.diffplug.spotless").version("6.25.0")
// plugin("protobuf", "com.google.protobuf").version("0.9.4")
// plugin("test-logger", "com.adarshr.test-logger").version("4.0.0")
// }
// }
}
dependencyResolutionManagement { repositories { mavenCentral() } }

0 comments on commit 8d737b2

Please sign in to comment.