From ae2a1b578a66d7c805a2fcd37878c482faa11f55 Mon Sep 17 00:00:00 2001
From: Ryan Brink <5607577+unredundant@users.noreply.github.com>
Date: Sun, 16 Jan 2022 22:22:33 -0500
Subject: [PATCH] chore: version bumps and cleanup (#156)

---
 .gitignore                              |  2 --
 CHANGELOG.md                            |  1 +
 build.gradle.kts                        | 19 ++++++++++++++++++-
 gradle.properties                       |  2 +-
 kompendium-annotations/build.gradle.kts | 13 +++----------
 kompendium-auth/build.gradle.kts        | 13 +++----------
 kompendium-core/build.gradle.kts        | 13 +++----------
 kompendium-locations/build.gradle.kts   | 13 +++----------
 kompendium-oas/build.gradle.kts         | 15 ++++-----------
 kompendium-playground/build.gradle.kts  |  4 ++--
 kompendium-swagger-ui/build.gradle.kts  | 13 +++----------
 11 files changed, 41 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index 43a50b842..d49a8b533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 .gradle
 build
 .idea
-dokka
-wiki
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 145749594..248e33a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Added
 
 ### Changed
+- Gradle refactor
 
 ### Remove
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 18c93f945..9e66ad3ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
   kotlin("jvm") version "1.6.10" apply false
-  id("io.bkbn.sourdough.root") version "0.5.5"
+  kotlin("plugin.serialization") version "1.6.10" apply false
+  id("io.bkbn.sourdough.library.jvm") version "0.5.6" apply false
+  id("io.bkbn.sourdough.application.jvm") version "0.5.6" apply false
+  id("io.bkbn.sourdough.root") version "0.5.6"
   id("com.github.jakemarsden.git-hooks") version "0.0.2"
   id("org.jetbrains.dokka") version "1.6.10"
   id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
@@ -27,3 +30,17 @@ allprojects {
     }
   }
 }
+
+subprojects {
+  plugins.withType(io.bkbn.sourdough.gradle.library.jvm.LibraryJvmPlugin::class) {
+    extensions.configure(io.bkbn.sourdough.gradle.library.jvm.LibraryJvmExtension::class) {
+      githubOrg.set("bkbnio")
+      githubRepo.set("kompendium")
+      licenseName.set("MIT License")
+      licenseUrl.set("https://mit-license.org")
+      developerId.set("unredundant")
+      developerName.set("Ryan Brink")
+      developerEmail.set("admin@bkbn.io")
+    }
+  }
+}
diff --git a/gradle.properties b/gradle.properties
index e2cf6dee6..d35161927 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Kompendium
-project.version=2.0.0-beta
+project.version=2.0.0-rc1
 # Kotlin
 kotlin.code.style=official
 # Gradle
diff --git a/kompendium-annotations/build.gradle.kts b/kompendium-annotations/build.gradle.kts
index 26ddb877a..e9211c512 100644
--- a/kompendium-annotations/build.gradle.kts
+++ b/kompendium-annotations/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm")
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -10,15 +10,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium Annotations")
   libraryDescription.set("A set of annotations used by Kompendium to generate OpenAPI Specifications")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
 }
 
 testing {
diff --git a/kompendium-auth/build.gradle.kts b/kompendium-auth/build.gradle.kts
index 83a0d5263..89726d7de 100644
--- a/kompendium-auth/build.gradle.kts
+++ b/kompendium-auth/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm")
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -10,15 +10,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium Authentication")
   libraryDescription.set("Kompendium library to pair with Ktor Auth to provide authorization info to OpenAPI")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
 }
 
 dependencies {
diff --git a/kompendium-core/build.gradle.kts b/kompendium-core/build.gradle.kts
index 6f33e7bfd..8272e4320 100644
--- a/kompendium-core/build.gradle.kts
+++ b/kompendium-core/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm")
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -11,15 +11,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium Core")
   libraryDescription.set("Core functionality for the Kompendium library")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
   compilerArgs.set(listOf("-opt-in=kotlin.RequiresOptIn"))
 }
 
diff --git a/kompendium-locations/build.gradle.kts b/kompendium-locations/build.gradle.kts
index 2f8a99257..7bc5eaa5e 100644
--- a/kompendium-locations/build.gradle.kts
+++ b/kompendium-locations/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm")
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -10,15 +10,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium Locations")
   libraryDescription.set("Supplemental library for Kompendium offering support for Ktor's Location API")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
   compilerArgs.set(listOf("-opt-in=kotlin.RequiresOptIn"))
 }
 
diff --git a/kompendium-oas/build.gradle.kts b/kompendium-oas/build.gradle.kts
index bb265f23d..7f51748a0 100644
--- a/kompendium-oas/build.gradle.kts
+++ b/kompendium-oas/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
   kotlin("jvm")
-  kotlin("plugin.serialization") version "1.6.10"
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  kotlin("plugin.serialization")
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -11,15 +11,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium OpenAPI Spec")
   libraryDescription.set("Collections of kotlin data classes modeling the OpenAPI specification")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
   compilerArgs.set(listOf("-opt-in=kotlin.RequiresOptIn"))
 }
 
diff --git a/kompendium-playground/build.gradle.kts b/kompendium-playground/build.gradle.kts
index c4925025d..c99e63221 100644
--- a/kompendium-playground/build.gradle.kts
+++ b/kompendium-playground/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   kotlin("jvm")
-  kotlin("plugin.serialization") version "1.6.10"
-  id("io.bkbn.sourdough.application.jvm") version "0.5.5"
+  kotlin("plugin.serialization")
+  id("io.bkbn.sourdough.application.jvm")
   id("application")
 }
 
diff --git a/kompendium-swagger-ui/build.gradle.kts b/kompendium-swagger-ui/build.gradle.kts
index 1f99a4630..4fbd92d76 100644
--- a/kompendium-swagger-ui/build.gradle.kts
+++ b/kompendium-swagger-ui/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm")
-  id("io.bkbn.sourdough.library.jvm") version "0.5.5"
-  id("io.gitlab.arturbosch.detekt") version "1.19.0"
-  id("com.adarshr.test-logger") version "3.1.0"
+  id("io.bkbn.sourdough.library.jvm")
+  id("io.gitlab.arturbosch.detekt")
+  id("com.adarshr.test-logger")
   id("org.jetbrains.dokka")
   id("maven-publish")
   id("java-library")
@@ -10,15 +10,8 @@ plugins {
 }
 
 sourdough {
-  githubOrg.set("bkbnio")
-  githubRepo.set("kompendium")
   libraryName.set("Kompendium Swagger")
   libraryDescription.set("Offers Swagger as a bundled WebJAR for Ktor")
-  licenseName.set("MIT License")
-  licenseUrl.set("https://mit-license.org")
-  developerId.set("unredundant")
-  developerName.set("Ryan Brink")
-  developerEmail.set("admin@bkbn.io")
 }
 
 dependencies {