From 3d3d0d2ca27db4783c04700369523fd69c2a2445 Mon Sep 17 00:00:00 2001 From: Masato TOYOSHIMA Date: Mon, 11 Nov 2024 15:46:48 +0900 Subject: [PATCH] gradle version up test(#46) --- .github/workflows/gradle.yml | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- kanaria_jvm/build.gradle.kts | 131 ++++++++++------------- 3 files changed, 61 insertions(+), 76 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e954a9a..773ab17 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,11 +9,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: 11 distribution: 'temurin' + java-version: 17 - name: Set up Rust run: | rustup toolchain install stable --profile minimal diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d93569..a32505a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Wed Jan 01 14:26:11 JST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/kanaria_jvm/build.gradle.kts b/kanaria_jvm/build.gradle.kts index 59b85eb..037fd07 100644 --- a/kanaria_jvm/build.gradle.kts +++ b/kanaria_jvm/build.gradle.kts @@ -2,104 +2,89 @@ import java.nio.file.Files import java.nio.file.Paths plugins { - maven + `maven-publish` `kotlin-dsl` - id("org.jetbrains.dokka") version "0.10.0" - id("com.jfrog.bintray") version "1.8.4" + id("org.jetbrains.dokka") version "1.9.20" id("com.osm.gradle.plugins.rustic") version "0.2.7" } val GITHUB_URL = "https://github.com/samunohito/kanaria" group = "com.kanaria" -version = "0.2.0" +version = "0.2.1" dependencies { - "implementation"(group = "jaxen", name = "jaxen", version = "1.1.6") - "implementation"(group = "org.dom4j", name = "dom4j", version = "2.1.1") - "implementation"(group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8") - "testImplementation"(group = "junit", name = "junit", version = "4.12") - "testImplementation"(group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version = "1.3.21") + "implementation"(group = "jaxen", name = "jaxen", version = "2.0.0") + "implementation"(group = "org.dom4j", name = "dom4j", version = "2.1.4") + "testImplementation"(group = "junit", name = "junit", version = "4.13.2") + "testImplementation"(group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version = "2.0.21") } -tasks { - val dokka by getting(org.jetbrains.dokka.gradle.DokkaTask::class) { - outputFormat = "html" - outputDirectory = "$buildDir/javadoc" - } +tasks.dokkaHtml { + outputDirectory.set(layout.buildDirectory.dir("javadoc")) } -configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 sourceSets { - getByName("main").java.srcDirs("src/main/kotlin") - getByName("test").java.srcDirs("src/test/kotlin") - } - - tasks { - getByName("javadoc", Javadoc::class) { - options.locale = "ja_JP" - isFailOnError = false - source = sourceSets["main"].allJava + main { + java.srcDirs("src/main/kotlin") } - - val sourcesJar by creating(Jar::class) { - dependsOn(JavaPlugin.CLASSES_TASK_NAME) - archiveClassifier.set("sources") - from(sourceSets["main"].allSource) + test { + java.srcDirs("src/test/kotlin") } + } +} - val javadocJar by creating(Jar::class) { - dependsOn(JavaPlugin.JAVADOC_TASK_NAME) - archiveClassifier.set("javadoc") - from(getByName("javadoc", Javadoc::class).destinationDir) - } +tasks { + named("javadoc") { + options.locale = "ja_JP" + isFailOnError = false + source = sourceSets["main"].allJava + } - artifacts { - add("archives", sourcesJar) - add("archives", javadocJar) - } + register("sourcesJar") { + dependsOn(JavaPlugin.CLASSES_TASK_NAME) + archiveClassifier.set("sources") + from(sourceSets["main"].allSource) } -} -bintray { - user = if (project.hasProperty("bintray_user")) project.properties["bintray_user"].toString() else "" - key = if (project.hasProperty("bintray_apikey")) project.properties["bintray_apikey"].toString() else "" - pkg.apply { - repo = "maven" - name = "${project.group}.${project.name}" - websiteUrl = GITHUB_URL - issueTrackerUrl = "${GITHUB_URL}/issues" - vcsUrl = "${GITHUB_URL}.git" - publicDownloadNumbers = true - setVersion(project.version) + register("javadocJar") { + dependsOn(JavaPlugin.JAVADOC_TASK_NAME) + archiveClassifier.set("javadoc") + from(named("javadoc").get().destinationDir) } - setConfigurations("archives") } -tasks.getByName("install", Upload::class) { - repositories.withGroovyBuilder { - "mavenInstaller" { - "pom" { - "project" { - setProperty("groupId", project.group) - setProperty("artifactId", project.name) - setProperty("version", project.version) - - "licenses" { - "license" { - setProperty("name", "The MIT License") - setProperty("url", "https://opensource.org/licenses/MIT") - setProperty("distribution", "repo") - } - } +artifacts { + add("archives", tasks["sourcesJar"]) + add("archives", tasks["javadocJar"]) +} - "scm" { - setProperty("connection", "${GITHUB_URL}.git") - setProperty("url", GITHUB_URL) +publishing { + publications { + create("maven") { + pom { + name.set("${project.name}") + description.set("This library provides functions such as hiragana, katakana, half-width and full-width mutual conversion and discrimination.") + url.set(GITHUB_URL) + licenses { + license { + name.set("MIT License") + url.set("https://opensource.org/licenses/MIT") + distribution.set("repo") + } + } + developers { + developer { + id.set("samunohito") + name.set("samunohito") + email.set("46447427+samunohito@users.noreply.github.com") } } + scm { + url.set("${GITHUB_URL}.git") + } } } }