diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..90f1f54b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Indentation +[*] +indent_style = space +indent_size = 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b254846a..1b5dd4fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,12 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' + distribution: 'corretto' - name: Build & Test uses: burrunan/gradle-cache-action@v1 @@ -26,7 +27,7 @@ jobs: arguments: build - name: Updload Reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: reports path: build/reports @@ -40,7 +41,7 @@ jobs: if: github.event.pull_request.merged || github.event_name == 'push' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build uses: burrunan/gradle-cache-action@v1 @@ -54,11 +55,11 @@ jobs: job-id: jdk8-build-test arguments: publishMavenRelease properties: | - ossrhUsername=${{ secrets.OSSRH_USER }} - ossrhPassword=${{ secrets.OSSRH_PASS }} + ossrhUsername=${{ secrets.OSSRH_USERNAME }} + ossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish Documentation - uses: JamesIves/github-pages-deploy-action@4.0.0 + uses: JamesIves/github-pages-deploy-action@4.5.0 with: branch: gh-pages clean: false diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ac0a8fae..871c0347 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,11 +11,12 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' + distribution: 'corretto' - uses: olegtarasov/get-tag@v2.1 id: tagName @@ -25,9 +26,8 @@ jobs: - name: Publish Maven uses: burrunan/gradle-cache-action@v1 env: - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} with: job-id: jdk8-build-test arguments: >- @@ -36,8 +36,8 @@ jobs: -x test properties: | releaseVersion=${{ steps.tagName.outputs.tag }} - ossrhUsername=${{ secrets.OSSRH_USER }} - ossrhPassword=${{ secrets.OSSRH_PASS }} + ossrhUsername=${{ secrets.OSSRH_USERNAME }} + ossrhPassword=${{ secrets.OSSRH_PASSWORD }} github.token=${{ secrets.GITHUB_TOKEN }} - name: Build Docs @@ -47,7 +47,7 @@ jobs: arguments: dokkaHtml - name: Publish Documentation - uses: JamesIves/github-pages-deploy-action@4.0.0 + uses: JamesIves/github-pages-deploy-action@4.5.0 with: branch: gh-pages clean: false diff --git a/.gitignore b/.gitignore index d7a6ce0b..7a3d2072 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ gradle-app.setting run /.idea +/bin diff --git a/build.gradle.kts b/build.gradle.kts index c9d0a8b3..cd807957 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,7 @@ plugins { kotlin("jvm") version "1.9.22" id("org.jetbrains.dokka") version "1.9.20" - id("net.minecrell.licenser") version "0.4.1" - id("org.jmailen.kotlinter") version "3.3.0" + id("org.jmailen.kotlinter") version "4.3.0" id("com.github.breadmoirai.github-release") version "2.2.12" } @@ -19,7 +18,7 @@ val releaseVersion: String by project val isSnapshot = releaseVersion.endsWith("SNAPSHOT") -group = "io.outfoxx" +group = "de.voize" version = releaseVersion description = "A Kotlin/Java API for generating .ts source files." @@ -36,7 +35,6 @@ val hamcrestVersion = "1.3" repositories { mavenCentral() - jcenter() } dependencies { @@ -95,7 +93,7 @@ tasks { // jacoco { - toolVersion = "0.8.5" + toolVersion = "0.8.11" } tasks { @@ -126,21 +124,6 @@ tasks { } } - -// -// CHECKS -// - -kotlinter { - indentSize = 2 -} - -license { - header = file("HEADER.txt") - include("**/*.kt") -} - - // // PUBLISHING // @@ -153,54 +136,42 @@ publishing { from(components["java"]) pom { - name.set("TypeScript Poet") description.set("TypeScriptPoet is a Kotlin and Java API for generating .ts source files.") - url.set("https://github.com/outfoxx/typescriptpoet") + url.set("https://github.com/voize-gmbh/typescriptpoet") - organization { - name.set("Outfox, Inc.") - url.set("https://outfoxx.io") - } - - issueManagement { - system.set("GitHub") - url.set("https://github.com/outfoxx/typescriptpoet/issues") + scm { + url.set("https://github.com/voize-gmbh/reakt-native-toolkit") } licenses { license { - name.set("Apache License 2.0") - url.set("https://raw.githubusercontent.com/outfoxx/typescriptpoet/master/LICENSE.txt") - distribution.set("repo") + name.set("Apache-2.0") + url.set("https://opensource.org/licenses/Apache-2.0") } } - - scm { - url.set("https://github.com/outfoxx/typescriptpoet") - connection.set("scm:https://github.com/outfoxx/typescriptpoet.git") - developerConnection.set("scm:git@github.com:outfoxx/typescriptpoet.git") - } - developers { developer { - id.set("kdubb") - name.set("Kevin Wooten") - email.set("kevin@outfoxx.io") + id.set("LeonKiefer") + name.set("Leon Kiefer") + email.set("leon@voize.de") + } + developer { + id.set("ErikZiegler") + name.set("Erik Ziegler") + email.set("erik@voize.de") } } - } } - } repositories { maven { name = "MavenCentral" - val snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - val releaseUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + val snapshotUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/" + val releaseUrl = "https://s01.oss.sonatype.org/service/local/" url = uri(if (isSnapshot) snapshotUrl else releaseUrl) credentials { @@ -215,10 +186,9 @@ publishing { signing { if (!hasProperty("signing.keyId")) { - val signingKeyId: String? by project val signingKey: String? by project val signingPassword: String? by project - useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + useInMemoryPgpKeys(signingKey, signingPassword) } sign(publishing.publications["library"]) }