From ba97cc71c55c298cddcb2c8abdcb60b98fb47920 Mon Sep 17 00:00:00 2001
From: Kengo TODA <skypencil@gmail.com>
Date: Sun, 5 Dec 2021 10:24:55 +0800
Subject: [PATCH] build: use Gradle 7 to build the project

---
 .github/workflows/build.yml              | 10 +++-------
 build.gradle                             | 23 +++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle                          |  1 +
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 settings.gradle

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b8c3f9e..61a60ed2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,21 +17,17 @@ jobs:
       with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: 11
+        distribution: 'temurin'
+        cache: 'gradle'
     - name: Cache SonarCloud packages
       uses: actions/cache@v1
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
-    - name: Cache Gradle packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
     - name: Build and analyze
       uses: eskatos/gradle-command-action@v1
       with:
diff --git a/build.gradle b/build.gradle
index 705010f1..c968cd60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.sonarqube' version '3.0'
+    id 'org.sonarqube' version '3.3'
     id 'jacoco'
 }
 
@@ -8,8 +8,9 @@ group = 'com.worksap.nlp'
 archivesBaseName = 'analysis-sudachi'
 version = '2.1.1-SNAPSHOT'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+tasks.withType(JavaCompile) {
+    options.release = 8
+}
 
 repositories {
     mavenCentral()
@@ -21,28 +22,30 @@ dependencies {
     testRuntimeOnly "org.apache.logging.log4j:log4j-core:2.11.1"
 }
 
-task buildTestDict(dependsOn: 'processTestResources', type: JavaExec) {
-    main = 'com.worksap.nlp.sudachi.dictionary.DictionaryBuilder'
+def buildTestDict = tasks.register('buildTestDict', JavaExec) {
+    dependsOn processTestResources
+    mainClass = 'com.worksap.nlp.sudachi.dictionary.DictionaryBuilder'
     classpath = sourceSets.main.runtimeClasspath
     args('-o', 'build/resources/test/com/worksap/nlp/lucene/sudachi/ja/system_core.dic', '-m', 'src/test/dict/matrix.def', 'src/test/dict/lex.csv')
 }
 test.dependsOn buildTestDict
 
-task embedVersion(type: Copy) {
+def embedVersion = tasks.register('embedVersion', Copy) {
     from 'src/main/extras/plugin-descriptor.properties'
     into 'build/descriptor'
     expand([version: version, elasticsearchVersion: elasticsearchVersion])
 }
 
-task copyDependencies(type: Copy) {
+def copyDependencies = tasks.register('copyDependencies', Copy) {
     def libs = ['sudachi', 'javax.json', 'jdartsclone']
     from configurations.runtimeClasspath.collect { f -> (libs.any { f.name.startsWith(it) }) ? f : null }
     into 'build/libs'
 }
 
-task distZip(dependsOn: ['jar', 'embedVersion', 'copyDependencies'], type: Zip) {
+def distZip = tasks.register('distZip', Zip) {
+    dependsOn 'jar', embedVersion, copyDependencies
     archiveBaseName = archivesBaseName
-    appendix = elasticsearchVersion
+    archiveAppendix = elasticsearchVersion
     from 'build/libs/', 'build/descriptor', 'LICENSE', 'README.md'
 }
 
@@ -60,7 +63,7 @@ sonarqube {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required = true
     }
     dependsOn test
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d9ca164..84d1f85f 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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..35f4c910
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "elasticsearch-sudachi"
\ No newline at end of file