Bump all the things (cortinico#75)

CHANGELOG.md

@@ -5,7 +5,10 @@ Please add your entries according to this format.
 
 ## Unreleased
 
-- Kotlin to 1.6.21
+- Move to Version Catalog
+- KtFmt to 0.39
+- Gradle to 7.5.1
+- Kotlin to 1.7.10
 - AGP to 7.1.3
 - Kotlinx Coroutines to 1.6.1
 

build.gradle.kts

@@ -1,21 +1,14 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    kotlin("jvm") version BuildPluginsVersion.KOTLIN apply false
-    id("io.gitlab.arturbosch.detekt") version BuildPluginsVersion.DETEKT
-    id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
+    alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.versionCheck)
 }
 
 subprojects {
     apply {
-        plugin("io.gitlab.arturbosch.detekt")
+        plugin(rootProject.libs.plugins.detekt.get().pluginId)
     }
 
     detekt {

example/build.gradle.kts

@@ -8,10 +8,8 @@ ktfmt {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-
-    testImplementation(platform(TestingLib.JUNIT_BOM))
-    testImplementation(TestingLib.JUPITER)
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.jupiter)
 }
 
 tasks.withType<Test> {

gradle/libs.versions.toml

@@ -0,0 +1,31 @@
+[versions]
+agp = "7.1.3"
+binaryCompatibilityValidator = "0.11.0"
+coroutines = "1.6.4"
+detekt = "1.21.0"
+diffUtils = "4.12"
+junit = "5.8.2"
+kotlin = "1.7.10"
+ktfmt-plugin = "0.8.0"
+ktfmt = "0.39"
+pluginPublish = "1.0.0"
+truth = "1.1.3"
+versionCheck = "0.42.0"
+
+[plugins]
+binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidator" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt-plugin" }
+pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" }
+versionCheck = { id = "com.github.ben-manes.versions", version.ref = "versionCheck" }
+
+[libraries]
+agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+truth = { module = "com.google.truth:truth", version.ref = "truth" }
+diffUtils = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diffUtils" }
+ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin-build/build.gradle.kts

@@ -1,26 +1,21 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    kotlin("jvm") version BuildPluginsVersion.KOTLIN apply false
-    id("com.gradle.plugin-publish") version BuildPluginsVersion.PLUGIN_PUBLISH apply false
-    id("io.gitlab.arturbosch.detekt") version BuildPluginsVersion.DETEKT
-    id("com.ncorti.ktfmt.gradle") version BuildPluginsVersion.KTFMT
-    id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version BuildPluginsVersion.BINARY_COMPATIBILITY_VALIDATOR
+    alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.pluginPublish) apply false
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.ktfmt)
+    alias(libs.plugins.versionCheck)
+    alias(libs.plugins.binaryCompatibilityValidator)
 }
 
 allprojects {
-    group = PluginCoordinates.GROUP
-    version = PluginCoordinates.VERSION
-
-    repositories {
-        google()
-        mavenCentral()
-    }
+    group = property("GROUP").toString()
+    version = property("VERSION").toString()
 
     apply {
-        plugin("io.gitlab.arturbosch.detekt")
-        plugin("com.ncorti.ktfmt.gradle")
+        plugin(rootProject.libs.plugins.detekt.get().pluginId)
+        plugin(rootProject.libs.plugins.ktfmt.get().pluginId)
     }
 
     ktfmt {

plugin-build/gradle.properties

@@ -0,0 +1,8 @@
+ID=com.ncorti.ktfmt.gradle
+VERSION=0.8.0
+GROUP=com.ncorti.ktfmt.gradle
+DISPLAY_NAME=ktfmt-gradle
+DESCRIPTION=A Gradle plugin to run ktfmt formatter on your build
+WEBSITE=https://github.com/cortinico/ktfmt-gradle
+VCS_URL=https://github.com/cortinico/ktfmt-gradle
+IMPLEMENTATION_CLASS=com.ncorti.ktfmt.gradle.KtfmtPlugin

plugin-build/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin-build/plugin/build.gradle.kts

@@ -3,10 +3,9 @@ import org.gradle.configurationcache.extensions.serviceOf
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    `maven-publish`
     kotlin("jvm")
     id("java-gradle-plugin")
-    id("com.gradle.plugin-publish")
+    alias(libs.plugins.pluginPublish)
 }
 
 java {
@@ -20,35 +19,41 @@ java {
  * classpath via [PluginUnderTestMetadata] to make them available for testing.
  */
 val integrationTestRuntime: Configuration by configurations.creating
-integrationTestRuntime.extendsFrom(configurations.getByName("compileOnly"))
+integrationTestRuntime.apply {
+    extendsFrom(configurations.getByName("compileOnly"))
+    attributes {
+        attribute(Attribute.of("org.gradle.usage", String::class.java), "java-runtime")
+        attribute(Attribute.of("org.gradle.category", String::class.java), "library")
+    }
+}
 
 tasks.withType<PluginUnderTestMetadata>().configureEach {
     pluginClasspath.from(integrationTestRuntime)
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 
 dependencies {
-    implementation(Libs.COROUTINES_CORE)
-    implementation(Libs.KTFMT)
-    implementation(Libs.DIFF_UTILS)
+    implementation(libs.coroutines.core)
+    implementation(libs.ktfmt)
+    implementation(libs.diffUtils)
 
     compileOnly(gradleApi())
     compileOnly(kotlin("gradle-plugin"))
-    compileOnly(Libs.AGP)
+    compileOnly(libs.agp)
 
-    testImplementation(TestingLib.COROUTINES_TEST)
+    testImplementation(libs.coroutines.test)
     testImplementation(kotlin("gradle-plugin"))
-    testImplementation(Libs.AGP)
+    testImplementation(libs.agp)
 
-    testImplementation(platform(TestingLib.JUNIT_BOM))
-    testImplementation(TestingLib.JUPITER)
-    testImplementation(TestingLib.TRUTH)
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.jupiter)
+    testImplementation(libs.truth)
 
     testRuntimeOnly(
         files(
@@ -60,26 +65,21 @@ dependencies {
 
 gradlePlugin {
     plugins {
-        create(PluginCoordinates.ID) {
-            id = PluginCoordinates.ID
-            implementationClass = PluginCoordinates.IMPLEMENTATION_CLASS
-            version = PluginCoordinates.VERSION
+        create(property("ID").toString()) {
+            id = property("ID").toString()
+            implementationClass = property("IMPLEMENTATION_CLASS").toString()
+            version = property("VERSION").toString()
+            displayName = property("DISPLAY_NAME").toString()
         }
     }
 }
 
 // Configuration Block for the Plugin Marker artifact on Plugin Central
 pluginBundle {
-    website = PluginBundle.WEBSITE
-    vcsUrl = PluginBundle.VCS
-    description = PluginBundle.DESCRIPTION
-    tags = PluginBundle.TAGS
-
-    plugins {
-        getByName(PluginCoordinates.ID) {
-            displayName = PluginBundle.DISPLAY_NAME
-        }
-    }
+    website = property("WEBSITE").toString()
+    vcsUrl = property("VCS_URL").toString()
+    description = property("DESCRIPTION").toString()
+    tags = listOf("ktfmt", "kotlin", "formatter", "reformat", "style", "code", "linter", "plugin", "gradle")
 }
 
 tasks.withType<Test> {

plugin-build/plugin/src/test/resources/jvmProject/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.10"
     id("com.ncorti.ktfmt.gradle")
 }