Revert "Gradle updated to use libs.versions.toml"

This reverts commit e80cb0b.

Author: rozza

bson-kotlin/build.gradle.kts

@@ -18,12 +18,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("org.jetbrains.kotlin.jvm")
-    id("java-library")
+    `java-library`
 
     // Test based plugins
-    alias(libs.plugins.spotless)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.detekt)
+    id("com.diffplug.spotless")
+    id("org.jetbrains.dokka")
+    id("io.gitlab.arturbosch.detekt")
 }
 
 repositories {
@@ -39,13 +39,13 @@ ext.set("pomName", "Bson Kotlin")
 
 dependencies {
     // Align versions of all Kotlin components
-    implementation(platform(libs.kotlin.bom))
-    implementation(libs.kotlin.stdlib.jdk8)
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     api(project(path = ":bson", configuration = "default"))
-    implementation(libs.kotlin.reflect)
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
 
-    testImplementation(libs.junit.kotlin)
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
     testImplementation(project(path = ":driver-core", configuration = "default"))
 }
 

bson-kotlinx/build.gradle.kts

@@ -19,12 +19,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("org.jetbrains.kotlin.jvm")
     kotlin("plugin.serialization")
-    id("java-library")
+    `java-library`
 
     // Test based plugins
-    alias(libs.plugins.spotless)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.detekt)
+    id("com.diffplug.spotless")
+    id("org.jetbrains.dokka")
+    id("io.gitlab.arturbosch.detekt")
 }
 
 repositories {
@@ -38,28 +38,32 @@ description = "Bson Kotlinx Codecs"
 
 ext.set("pomName", "Bson Kotlinx")
 
+ext.set("kotlinxDatetimeVersion", "0.4.0")
+
+val kotlinxDatetimeVersion: String by ext
+
 java {
     registerFeature("dateTimeSupport") { usingSourceSet(sourceSets["main"]) }
     registerFeature("jsonSupport") { usingSourceSet(sourceSets["main"]) }
 }
 
 dependencies {
     // Align versions of all Kotlin components
-    implementation(platform(libs.kotlin.bom))
-    implementation(libs.kotlin.stdlib.jdk8)
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
-    implementation(platform(libs.kotlinx.serialization))
-    implementation(libs.kotlinx.serialization.core)
-    "dateTimeSupportImplementation"(libs.kotlinx.serialization.datetime)
-    "jsonSupportImplementation"(libs.kotlinx.serialization.json)
+    implementation(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.0"))
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core")
+    "dateTimeSupportImplementation"("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
+    "jsonSupportImplementation"("org.jetbrains.kotlinx:kotlinx-serialization-json")
 
     api(project(path = ":bson", configuration = "default"))
-    implementation(libs.kotlin.reflect)
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
 
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
     testImplementation(project(path = ":driver-core", configuration = "default"))
-    testImplementation(libs.junit.kotlin)
-    testImplementation(libs.kotlinx.serialization.datetime)
-    testImplementation(libs.kotlinx.serialization.json)
+    testImplementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
 }
 
 kotlin { explicitApi() }

build.gradle

@@ -14,21 +14,33 @@
  * limitations under the License.
  */
 
-plugins {
-    id("eclipse")
-    id("idea")
-
-    alias(libs.plugins.bnd) apply false
-    alias(libs.plugins.detekt) apply false
-    alias(libs.plugins.dokka) apply false
-    alias(libs.plugins.download) apply false
-    alias(libs.plugins.kotlin) apply false
-    alias(libs.plugins.kotlin.serialization) apply false
-    alias(libs.plugins.optional) apply false
-    alias(libs.plugins.scala.multiversion) apply false
-    alias(libs.plugins.spotbugs) apply false
-    alias(libs.plugins.spotless) apply false
-    alias(libs.plugins.test.logger) apply false
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.15"
+        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
+
+        // Scala plugins
+        classpath "com.adtran:scala-multiversion-plugin:2.0.4"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:6.14.0"
+
+        // kotlin plugins
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.10"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
+
+        // Test logging plugin
+        classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
+    }
 }
 
 //////////////////////////////////////////
@@ -37,6 +49,17 @@ plugins {
 
 ext {
     configDir = new File(rootDir, 'config')
+    jnrUnixsocketVersion = '0.38.17'
+    nettyVersion = '4.1.87.Final'
+    snappyVersion = '1.1.10.3'
+    zstdVersion = '1.5.5-3'
+    awsSdkV2Version = '2.18.9'
+    awsSdkV1Version = '1.12.337'
+    projectReactorVersion = '2022.0.0'
+    junitBomVersion = '5.10.2'
+    logbackVersion = '1.3.14'
+    graalSdkVersion = '24.0.0'
+    reflectionsVersion = '0.9.10'
     gitVersion = getGitVersion()
 }
 
@@ -86,21 +109,27 @@ configure(javaProjects) {
 }
 
 configure(scalaProjects) {
-    apply plugin: "java-library"
-    apply plugin: "scala"
+    apply plugin: 'scala'
+    apply plugin: 'java-library'
+    apply plugin: 'idea'
     apply plugin: "com.adtran.scala-multiversion-plugin"
     apply plugin: "com.diffplug.spotless"
 
     group = 'org.mongodb.scala'
 
     dependencies {
-        api(libs.scala.library)
-        api(libs.scala.reflect)
-
-        testImplementation(platform(libs.junit.bom))
-        testImplementation(libs.bundles.junit.vintage)
-        testImplementation(libs.bundles.scalatest)
-        testImplementation(libs.reflections)
+        api ('org.scala-lang:scala-library:%scala-version%')
+        api ('org.scala-lang:scala-reflect:%scala-version%')
+
+        testImplementation(platform("org.junit:junit-bom:$junitBomVersion"))
+        testImplementation("org.junit.vintage:junit-vintage-engine")
+
+        testImplementation('org.scalatest:scalatest-flatspec_%%:3.2.9')
+        testImplementation('org.scalatest:scalatest-shouldmatchers_%%:3.2.9')
+        testImplementation('org.scalatestplus:junit-4-13_%%:3.2.9.0')
+        testImplementation('org.scalatestplus:mockito-3-12_%%:3.2.10.0')
+        testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
+        testImplementation("org.reflections:reflections:$reflectionsVersion")
     }
 
     test{
@@ -148,12 +177,12 @@ configure(javaMainProjects) {
     apply plugin: 'java-library'
 
     dependencies {
-        compileOnly(libs.findbugs.jsr)
-        api(libs.slf4j, optional)
+        compileOnly 'com.google.code.findbugs:jsr305:1.3.9'
+        api 'org.slf4j:slf4j-api:1.7.6', optional
+        testImplementation 'com.google.code.findbugs:jsr305:1.3.9'
 
-        testImplementation(libs.findbugs.jsr)
         // https://issues.apache.org/jira/browse/GROOVY-10194
-        testImplementation(libs.groovy)
+        testImplementation 'org.codehaus.groovy:groovy-all:3.0.9'
     }
 
     /* Compiling */
@@ -222,19 +251,25 @@ configure(javaCodeCheckedProjects) {
     apply plugin: 'com.adarshr.test-logger'
 
     dependencies {
-        testImplementation(platform(libs.junit.bom))
-        testImplementation(libs.bundles.junit.vintage)
-
-        testImplementation(platform(libs.spock.bom))
-        testImplementation(libs.bundles.spock)
-
+        testImplementation(platform("org.junit:junit-bom:$junitBomVersion"))
+        testImplementation('org.junit.jupiter:junit-jupiter')
+        testImplementation('org.junit.jupiter:junit-jupiter-params')
+        testImplementation('org.junit.jupiter:junit-jupiter-engine')
+        testImplementation('org.junit.vintage:junit-vintage-engine')
+
+        testImplementation platform('org.spockframework:spock-bom:2.1-groovy-3.0')
+        testImplementation 'org.spockframework:spock-core'
+        testImplementation 'org.spockframework:spock-junit4'
         if ('8'.equals(findProperty("javaVersion"))) {
-            testImplementation(libs.bundles.mockito.java8)
+            testImplementation("org.mockito:mockito-core:4.6.1")
+            testImplementation("org.mockito:mockito-inline:4.6.1")
         } else {
-            testImplementation(libs.bundles.mockito)
+            testImplementation("org.mockito:mockito-core:5.11.0")
         }
-        testImplementation(libs.cglib)
-        testImplementation(libs.objenesis)
+        testImplementation 'cglib:cglib-nodep:2.2.2'
+        testImplementation 'org.objenesis:objenesis:1.3'
+        testImplementation 'org.hamcrest:hamcrest-all:1.3'
+        testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
         testImplementation project(':util:spock') //Adding categories to classpath
     }
 

driver-benchmarks/build.gradle

@@ -32,7 +32,7 @@ sourceSets {
 dependencies {
     api project(':driver-sync')
     api project(':mongodb-crypt')
-    implementation(libs.logback.classic)
+    implementation "ch.qos.logback:logback-classic:$logbackVersion"
 }
 
 javadoc {

driver-core/build.gradle

@@ -16,7 +16,7 @@
 
 
 plugins {
-    alias(libs.plugins.build.config)
+    id 'com.github.gmazzo.buildconfig' version '3.0.3'
 }
 
 archivesBaseName = 'mongodb-driver-core'
@@ -33,33 +33,38 @@ configurations {
     }
 }
 
+def classifiers = ["linux-x86_64", "linux-aarch_64", "osx-x86_64", "osx-aarch_64", "windows-x86_64"]
 dependencies {
     api project(path: ':bson', configuration: 'default')
     implementation project(path: ':bson-record-codec', configuration: 'default')
     implementation project(path: ':bson-kotlin', configuration: 'default'), optional
     implementation project(path: ':bson-kotlinx', configuration: 'default'), optional
     implementation project(path: ':mongodb-crypt', configuration: 'default'), optional
 
-    implementation(libs.jnr.unixsocket, optional)
-    api(platform(libs.netty.bom), optional)
-    api(libs.bundles.netty, optional)
-    compileOnly(libs.graal.sdk)
+    implementation "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
+    api platform("io.netty:netty-bom:$nettyVersion")
+    api "io.netty:netty-buffer", optional
+    api "io.netty:netty-transport", optional
+    api "io.netty:netty-handler", optional
+    compileOnly "org.graalvm.sdk:graal-sdk:$graalSdkVersion"
 
-    // Optionally depend on both AWS SDK v2 and v1.
-    // The driver will use v2 is present, v1 if present, or built-in functionality if neither are present
-    implementation(libs.bundles.aws.java.sdk.v1, optional)
-    implementation(libs.bundles.aws.java.sdk.v2, optional)
+    // Optionally depend on both AWS SDK v2 and v1.  The driver will use v2 is present, v1 if present, or built-in functionality if
+    // neither are present
+    implementation "software.amazon.awssdk:auth:$awsSdkV2Version", optional
+    implementation "software.amazon.awssdk:sts:$awsSdkV2Version", optional
+    implementation "com.amazonaws:aws-java-sdk-core:$awsSdkV1Version", optional
+    implementation "com.amazonaws:aws-java-sdk-sts:$awsSdkV1Version", optional
 
-    implementation(libs.snappy.java, optional)
-    implementation(libs.zstd.jni, optional)
+    implementation "org.xerial.snappy:snappy-java:$snappyVersion", optional
+    implementation "com.github.luben:zstd-jni:$zstdVersion", optional
 
     testImplementation project(':bson').sourceSets.test.output
-    testImplementation(libs.bundles.junit)
-    testImplementation(libs.reflections)
+    testImplementation('org.junit.jupiter:junit-jupiter-api')
+    testImplementation("org.reflections:reflections:$reflectionsVersion")
+    testRuntimeOnly "io.netty:netty-tcnative-boringssl-static"
 
-    testRuntimeOnly(libs.netty.boringssl)
-    ["linux-x86_64", "linux-aarch_64", "osx-x86_64", "osx-aarch_64", "windows-x86_64"].each { arch ->
-        testRuntimeOnly(variantOf(libs.netty.boringssl) { classifier(arch) })
+    classifiers.forEach {
+        testRuntimeOnly "io.netty:netty-tcnative-boringssl-static::$it"
     }
 }
 

driver-kotlin-coroutine/build.gradle.kts

@@ -18,12 +18,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("org.jetbrains.kotlin.jvm")
-    id("java-library")
+    `java-library`
 
     // Test based plugins
-    alias(libs.plugins.spotless)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.detekt)
+    id("com.diffplug.spotless")
+    id("org.jetbrains.dokka")
+    id("io.gitlab.arturbosch.detekt")
 }
 
 repositories {
@@ -56,25 +56,26 @@ val integrationTestImplementation: Configuration by
 
 dependencies {
     // Align versions of all Kotlin components
-    implementation(platform(libs.kotlin.bom))
-    implementation(libs.kotlin.stdlib.jdk8)
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
-    implementation(platform(libs.kotlinx.coroutines.bom))
-    api(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlinx.coroutines.reactive)
+    implementation(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive")
 
     api(project(path = ":bson", configuration = "default"))
     api(project(path = ":driver-reactive-streams", configuration = "default"))
     implementation(project(path = ":bson-kotlin", configuration = "default"))
 
-    testImplementation(libs.kotlin.reflect)
-    testImplementation(libs.junit.kotlin)
-    testImplementation(libs.bundles.mockito.kotlin)
-    testImplementation(libs.assertj)
-    testImplementation(libs.classgraph)
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:4.11.0")
+    testImplementation("org.assertj:assertj-core:3.24.2")
+    testImplementation("io.github.classgraph:classgraph:4.8.154")
 
-    integrationTestImplementation(libs.junit.kotlin)
-    integrationTestImplementation(libs.kotlinx.coroutines.test)
+    integrationTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
+    integrationTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
     integrationTestImplementation(project(path = ":driver-sync"))
     integrationTestImplementation(project(path = ":driver-core"))
     integrationTestImplementation(project(path = ":bson"))