Pre/v0.8.1

CHANGELOG.md

@@ -4,6 +4,16 @@
 
 -
 
+## [v0.8.1](https://github.com/WorksApplications/Sudachi/releases/tag/v0.8.1)
+
+### Added
+
+- Added new CLI option `--print-reading` (#366)
+  - With this, the reading form is printed in addition to the default output fields (surface, pos, normalized form).
+  - `-a` will override this.
+- Update github workflows (#363, #364, #367)
+  - Includes test with JDK 21
+
 ## [v0.8.0](https://github.com/WorksApplications/Sudachi/releases/tag/v0.8.0)
 
 > **CAUTION**

build.gradle

@@ -5,13 +5,13 @@
 plugins {
     id 'java'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.10' // only for tests, see gradle.properties
+    id 'org.jetbrains.kotlin.jvm' version '2.4.10' // only for tests, see gradle.properties
     id 'jacoco'
-    id 'org.sonarqube' version '3.4.0.2513'
-    id 'com.diffplug.spotless' version '6.9.1'
+    id 'org.sonarqube' version '7.5.0.8588'
+    id 'com.diffplug.spotless' version '7.2.1'
     id 'distribution'
     id 'signing'
-    id 'me.champeau.jmh' version "0.6.6"
+    id 'me.champeau.jmh' version "0.7.3"
     id 'io.github.gradle-nexus.publish-plugin' version "2.0.0"
 }
 
@@ -23,17 +23,17 @@ repositories {
 dependencies {
     implementation 'org.glassfish:javax.json:1.1.4'
     implementation 'com.worksap.nlp:jdartsclone:1.2.0'
-    testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.hamcrest:hamcrest-library:2.2'
+    testImplementation 'org.hamcrest:hamcrest:3.0'
+    testImplementation 'org.hamcrest:hamcrest-library:3.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.openjdk.jmh:jmh-core:1.35'
-    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.7.10'
+    testImplementation 'org.openjdk.jmh:jmh-core:1.37'
+    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
+    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.10'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:2.4.10'
 }
 
 group = 'com.worksap.nlp'
-version = '0.8.1-SNAPSHOT'
+version = '0.8.1'
 description = 'Sudachi Japanese Morphological Analyzer'
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
@@ -42,6 +42,12 @@ tasks.withType(JavaCompile) {
     options.release.set(8)
 }
 
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+    }
+}
+
 tasks.withType(Test) {
     systemProperty "file.encoding", "UTF-8"
 }
@@ -56,7 +62,7 @@ jacocoTestReport {
     }
 }
 
-sonarqube {
+sonar {
     properties {
         property "sonar.sourceEncoding", "UTF-8"
         property "sonar.host.url", "https://sonarcloud.io"
@@ -79,13 +85,13 @@ spotless {
         target '*.gradle', '*.md', '.gitignore', '*.txt', '*.csv'
 
         trimTrailingWhitespace()
-        indentWithSpaces(2)
+        leadingTabsToSpaces(2)
         endWithNewline()
     }
     java {
         // don't need to set target, it is inferred from java
         // version list: https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter
-        eclipse('4.21.0').configFile('.formatter/eclipse-formatter.xml')
+        eclipse('4.21').configFile('.formatter/eclipse-formatter.xml')
         licenseHeaderFile('.formatter/license-header')
     }
     kotlin {
@@ -193,11 +199,11 @@ signing {
     def signingKey = project.findProperty("gpg.key") ?: System.getenv("MAVEN_GPG_PRIVATE_KEY")
     def signingPassword = project.findProperty("gpg.password") ?: System.getenv("MAVEN_GPG_PASSPHRASE")
     useInMemoryPgpKeys(signingKey, signingPassword)
-    required { !project.version.endsWith("-SNAPSHOT") }
+    required = { !project.version.endsWith("-SNAPSHOT") }
     sign publishing.publications.maven
 }
 
 jmh {
-    jmhVersion = "1.35"
+    jmhVersion = "1.37"
     includeTests = true
 }