From be6fb8dc12e44b8eceb631d05e252955a13e57d6 Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Fri, 16 Apr 2021 10:56:01 +0200
Subject: [PATCH] Update gradle to 7.0

---
 .github/workflows/tests.yml              | 22 +++++++++++-----------
 build.gradle.kts                         |  3 +--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2fb31d5..1c8b2a3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Build
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: build -x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck -x detekt
     - name: Cleanup Gradle Cache
       # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
@@ -46,12 +46,12 @@ jobs:
     - name: processResources
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: processResources
     - name: processTestResources
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: processResources
     - uses: actions/upload-artifact@v2
       with:
@@ -76,13 +76,13 @@ jobs:
     - name: Composer Up
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: testSqlComposeUp
 
     - name: TestSql
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: testSql
 
   test:
@@ -105,19 +105,19 @@ jobs:
     - name: Composer Up
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: testComposeUp
 
     - name: Test
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: test
 
     - name: Coverage
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
@@ -132,7 +132,7 @@ jobs:
     - name: Test
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: test
 
     - name: Build and analyze
@@ -141,7 +141,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: sonarqube --info
 
   lint:
@@ -161,5 +161,5 @@ jobs:
     - name: Lint
       uses: eskatos/gradle-command-action@v1
       with:
-        gradle-version: 6.8
+        gradle-version: 7.0
         arguments: ktlintCheck
diff --git a/build.gradle.kts b/build.gradle.kts
index ce5b4b5..65cfa93 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,9 +28,8 @@ version = versioning.info.run {
 plugins {
     jacoco
     application
-    maven
+    `maven-publish`
 
-    id("maven-publish")
     kotlin("jvm") version "1.4.30"
     kotlin("plugin.serialization") version "1.4.30"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f..f371643 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-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists