From f271939f1a0bd7cdf28996974f151e6b7bb01bef Mon Sep 17 00:00:00 2001
From: slisaasquatch <sli@saasquat.ch>
Date: Fri, 5 Jan 2024 10:10:47 -0800
Subject: [PATCH] Dependency cleanup

---
 build.gradle              | 56 ++++++++++++++-------------------------
 gradle/libs.versions.toml | 20 --------------
 2 files changed, 20 insertions(+), 56 deletions(-)
 delete mode 100644 gradle/libs.versions.toml

diff --git a/build.gradle b/build.gradle
index 46a6c07..b446504 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,51 +1,35 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'java-library'
-    id 'maven-publish'
 }
 
+group = 'com.saasquatch'
+version = '0.0.6-SNAPSHOT'
+
+tasks.compileJava.options.encoding = 'UTF-8'
+tasks.compileTestJava.options.encoding = 'UTF-8'
+tasks.javadoc.options.encoding = 'UTF-8'
+
 repositories {
     mavenLocal()
-    maven {
-        url = uri('https://repo.maven.apache.org/maven2/')
-    }
 }
 
 dependencies {
-    api libs.org.apache.httpcomponents.client5.httpclient5
-    api libs.org.apache.httpcomponents.core5.httpcore5.reactive
-    api libs.io.reactivex.rxjava3.rxjava
-    api libs.com.google.code.findbugs.jsr305
-    testImplementation libs.org.junit.jupiter.junit.jupiter.api
-    testImplementation libs.org.junit.jupiter.junit.jupiter.engine
-    testImplementation libs.org.slf4j.slf4j.simple
+    api 'org.apache.httpcomponents.client5:httpclient5:5.3'
+    api 'org.apache.httpcomponents.core5:httpcore5-reactive:5.2.4'
+    api 'org.reactivestreams:reactive-streams:1.0.4'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.10'
 }
 
-group = 'com.saasquatch'
-version = '0.0.6-SNAPSHOT'
-description = 'apache-client5-reactive'
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-
-java {
-    withSourcesJar()
-    withJavadocJar()
+test {
+    useJUnitPlatform()
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from(components.java)
-        }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
     }
 }
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
-tasks.withType(Javadoc) {
-    options.encoding = 'UTF-8'
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
deleted file mode 100644
index ef4deac..0000000
--- a/gradle/libs.versions.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was generated by the Gradle 'init' task.
-# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
-[versions]
-com-google-code-findbugs-jsr305 = "3.0.2"
-io-reactivex-rxjava3-rxjava = "3.1.5"
-org-apache-httpcomponents-client5-httpclient5 = "5.2.1"
-org-apache-httpcomponents-core5-httpcore5-reactive = "5.2"
-org-junit-jupiter-junit-jupiter-api = "5.9.1"
-org-junit-jupiter-junit-jupiter-engine = "5.9.1"
-org-slf4j-slf4j-simple = "2.0.5"
-
-[libraries]
-com-google-code-findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "com-google-code-findbugs-jsr305" }
-io-reactivex-rxjava3-rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "io-reactivex-rxjava3-rxjava" }
-org-apache-httpcomponents-client5-httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "org-apache-httpcomponents-client5-httpclient5" }
-org-apache-httpcomponents-core5-httpcore5-reactive = { module = "org.apache.httpcomponents.core5:httpcore5-reactive", version.ref = "org-apache-httpcomponents-core5-httpcore5-reactive" }
-org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter-junit-jupiter-api" }
-org-junit-jupiter-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-jupiter-junit-jupiter-engine" }
-org-slf4j-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "org-slf4j-slf4j-simple" }