Update dependencies and remove jcenter

build.gradle.kts

@@ -8,44 +8,13 @@
  */
 
 import de.justjanne.coverageconverter.CoverageConverterExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("org.jlleitschuh.gradle.ktlint") version "10.0.0" apply false
   id("com.vanniktech.maven.publish") version "0.13.0" apply false
   id("de.justjanne.jacoco-cobertura-converter") apply false
-}
-
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
-    classpath("org.jetbrains.kotlin", "kotlin-gradle-plugin", "1.4.31")
-  }
-}
-
-allprojects {
-  apply(plugin = "org.jetbrains.dokka")
-  repositories {
-    mavenCentral()
-    google()
-    exclusiveContent {
-      forRepository {
-        maven {
-          name = "JCenter"
-          setUrl("https://jcenter.bintray.com/")
-        }
-      }
-      filter {
-        // Required for Dokka
-        includeModule("com.soywiz.korlibs.korte", "korte-jvm")
-        includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
-        includeGroup("org.jetbrains.dokka")
-        includeModule("org.jetbrains", "markdown")
-      }
-    }
-  }
+  id("org.jetbrains.dokka") version "1.4.32" apply false
 }
 
 subprojects {
@@ -53,6 +22,12 @@ subprojects {
   apply(plugin = "org.jlleitschuh.gradle.ktlint")
   apply(plugin = "jacoco")
   apply(plugin = "de.justjanne.jacoco-cobertura-converter")
+  apply(plugin = "org.jetbrains.dokka")
+
+  repositories {
+    mavenCentral()
+    google()
+  }
 
   dependencies {
     val implementation by configurations
@@ -60,10 +35,11 @@ subprojects {
     val testRuntimeOnly by configurations
 
     implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.4.2")
-
     testImplementation(kotlin("test-junit5"))
-    testImplementation("org.jetbrains.kotlinx", "kotlinx-coroutines-test", "1.4.2")
+
+    val kotlinxCoroutinesVersion: String by project
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", kotlinxCoroutinesVersion)
+    testImplementation("org.jetbrains.kotlinx", "kotlinx-coroutines-test", kotlinxCoroutinesVersion)
 
     val junit5Version: String by project
     testImplementation("org.junit.jupiter", "junit-jupiter-api", junit5Version)
@@ -78,7 +54,7 @@ subprojects {
     useJUnitPlatform()
   }
 
-  tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+  tasks.withType<KotlinCompile> {
     kotlinOptions {
       jvmTarget = "1.8"
       freeCompilerArgs = listOf(
@@ -88,6 +64,10 @@ subprojects {
     }
   }
 
+  configure<JacocoPluginExtension> {
+    toolVersion = "0.8.7"
+  }
+
   configure<CoverageConverterExtension> {
     autoConfigureCoverage = true
   }

buildSrc/build.gradle.kts

@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin", "kotlin-gradle-plugin", "1.4.30")
+  implementation("org.jetbrains.kotlin", "kotlin-gradle-plugin", "1.5.10")
   implementation("de.justjanne", "jacoco-cobertura-converter", "1.0.0")
   implementation(gradleApi())
   implementation(localGroovy())

buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt

@@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
 import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import de.justjanne.coverageconverter.convertCounter
 import de.justjanne.coverageconverter.jacoco.CounterTypeDto
 import de.justjanne.coverageconverter.jacoco.ReportDto
 import org.gradle.api.Action

buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt

@@ -11,6 +11,7 @@ package de.justjanne.coverageconverter
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import java.io.File
@@ -18,14 +19,6 @@ import java.io.File
 class CoverageConverterPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     val extension = project.extensions.create("coverage", CoverageConverterExtension::class.java)
-
-    if (extension.autoConfigureCoverage) {
-      val jacocoPluginExtension = project.extensions.findByType(JacocoPluginExtension::class.java)
-      if (jacocoPluginExtension != null) {
-        jacocoPluginExtension.toolVersion = "0.8.3"
-      }
-    }
-
     project.afterEvaluate {
       val testTask = tasks.getByName("test")
 

gradle.properties

@@ -2,11 +2,16 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 kotlin.code.style=official
 
 bouncyCastleVersion=1.68
-hamcrestVersion=2.1
-junit5Version=5.6.0
-kotlinBitflagsVersion=1.1.0
+hamcrestVersion=2.2
+junit5Version=5.7.2
+kotlinVersion=1.5.10
+kotlinBitflagsVersion=1.3.0
+kotlinxCoroutinesVersion=1.5.0
 sl4jVersion=1.7.30
-testcontainersCiVersion=1.2.0
+testcontainersCiVersion=1.3.0
+threetenBpVersion=1.5.1
+kotlinPoetVersion=1.8.0
+kspVersion=1.5.10-1.0.0-beta01
 
 GROUP=de.justjanne.libquassel
 VERSION_NAME=0.3.1

gradle/wrapper/gradle-wrapper.properties

-#
-# libquassel
-# Copyright (c) 2021 Janne Mareike Koschinski
-#
-# This Source Code Form is subject to the terms of the Mozilla Public License,
-# v. 2.0. If a copy of the MPL was not distributed with this file, You can
-# obtain one at https://mozilla.org/MPL/2.0/.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
-distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Szm=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

libquassel-generator/build.gradle.kts

@@ -12,7 +12,9 @@ repositories {
 }
 
 dependencies {
-  implementation("com.google.devtools.ksp:symbol-processing-api:1.4.30-1.0.0-alpha02")
+  val kspVersion: String by project
+  implementation("com.google.devtools.ksp", "symbol-processing-api", kspVersion)
   implementation(project(":libquassel-annotations"))
-  implementation("com.squareup", "kotlinpoet", "1.7.2")
+  val kotlinPoetVersion: String by project
+  implementation("com.squareup", "kotlinpoet", kotlinPoetVersion)
 }

libquassel-protocol/build.gradle.kts

@@ -10,11 +10,12 @@
 plugins {
   id("java-library")
   id("com.vanniktech.maven.publish")
-  id("com.google.devtools.ksp") version "1.4.30-1.0.0-alpha02"
+  id("com.google.devtools.ksp") version "1.5.10-1.0.0-beta01"
 }
 
 dependencies {
-  api("org.threeten", "threetenbp", "1.4.0")
+  val threetenBpVersion: String by project
+  api("org.threeten", "threetenbp", threetenBpVersion)
   val kotlinBitflagsVersion: String by project
   api("de.justjanne", "kotlin-bitflags", kotlinBitflagsVersion)
   val bouncyCastleVersion: String by project

settings.gradle.kts

@@ -20,5 +20,6 @@ pluginManagement {
   repositories {
     gradlePluginPortal()
     google()
+    mavenCentral()
   }
 }