From 1ae41c0374b7a75d146f49005bd27e3f0a350d14 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 20:30:47 -0700
Subject: [PATCH] Updated to Gradle 7.0.1

---
 build.gradle.kts                                  | 14 ++++++++++++--
 examples/build.gradle.kts                         |  4 ++--
 examples/gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fe6d980..e0f89aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URL
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
     jacoco
+    java
     `java-library`
     `maven-publish`
     signing
@@ -39,6 +41,8 @@ repositories {
 }
 
 dependencies {
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+
     implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}")
     implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
     implementation("org.json:json:20210307")
@@ -86,12 +90,18 @@ tasks {
         kotlinOptions.jvmTarget = "1.8"
     }
 
+    withType<Test> {
+        testLogging {
+            exceptionFormat = TestExceptionFormat.FULL
+        }
+    }
+
     withType<GenerateMavenPom> {
         destination = file("$projectDir/pom.xml")
     }
 
     jacoco {
-        toolVersion = "0.8.7-SNAPSHOT"
+        toolVersion = "0.8.7"
     }
 
     jacocoTestReport {
@@ -208,7 +218,7 @@ publishing {
                 scm {
                     connection.set("scm:git:git://github.com/$gitHub.git")
                     developerConnection.set("scm:git:git@github.com:$gitHub.git")
-                    url.set("$mavenUrl")
+                    url.set(mavenUrl)
                 }
                 issueManagement {
                     system.set("GitHub")
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 06c5576..0e74114 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
 }
 
 application {
-    mainClassName = "com.example.BitlyExampleKt"
+    mainClass.set("com.example.BitlyExampleKt")
 }
 
 tasks {
@@ -32,6 +32,6 @@ tasks {
     register("runRetrieve", JavaExec::class) {
         group = "application"
         main = "com.example.BitlyRetrieveKt"
-        classpath = sourceSets["main"].runtimeClasspath
+        classpath = sourceSets.main.get().runtimeClasspath
     }
 }
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 442d913..e5338d3 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643..e5338d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists