diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e195327d..f321fd95 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -49,7 +49,7 @@ jobs: java-version: 11 - uses: eskatos/gradle-command-action@v1 with: - arguments: :darklaf-core:makeDocumentation + arguments: :darklaf-core:makeDocumentation -PskipAutostyle - name: Upload documentation uses: actions/upload-artifact@v1 with: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3b73fc1b..36ec775f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -44,7 +44,7 @@ jobs: with: java-version: 11 - name: Build - run: ./gradlew build + run: ./gradlew build -PskipAutostyle linux: name: Linux (Java 8) @@ -58,7 +58,7 @@ jobs: with: java-version: 8 - name: Build - run: ./gradlew build + run: ./gradlew build -PskipAutostyle macos: name: macOS (Java 11) @@ -72,4 +72,4 @@ jobs: with: java-version: 11 - name: Build - run: ./gradlew build + run: ./gradlew build -PskipAutostyle diff --git a/.github/workflows/libs.yml b/.github/workflows/libs.yml index caead39f..7668824a 100644 --- a/.github/workflows/libs.yml +++ b/.github/workflows/libs.yml @@ -51,7 +51,7 @@ jobs: with: java-version: 11 - name: Build - run: ./gradlew :darklaf-windows:build + run: ./gradlew :darklaf-windows:build -PskipAutostyle - name: Upload x86 artifact uses: actions/upload-artifact@v1 with: @@ -75,7 +75,7 @@ jobs: with: java-version: 11 - name: Build - run: ./gradlew :darklaf-macos:build + run: ./gradlew :darklaf-macos:build -PskipAutostyle - name: Upload artifact uses: actions/upload-artifact@v1 with: diff --git a/build.gradle.kts b/build.gradle.kts index 2fcc4b9d..9fd437d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,8 +21,8 @@ val skipAutostyle by props() val String.v: String get() = rootProject.extra["$this.version"] as String val buildVersion = "darklaf".v + releaseParams.snapshotSuffix -println("Building Darklaf $buildVersion") -println(" JDK: " + System.getProperty("java.home")) +println("Building: Darklaf $buildVersion") +println(" JDK: " + System.getProperty("java.home")) releaseParams { tlp.set("darklaf") @@ -133,6 +133,18 @@ allprojects { enabled = false } } + if (!skipAutostyle) { + autostyle { + cpp { + licenseHeader(File("${project.rootDir}/LICENSE").readText()) + trimTrailingWhitespace() + endWithNewline() + eclipse { + configFile("${project.rootDir}/darklaf_cpp.eclipseformat.xml") + } + } + } + } } if (!enableGradleMetadata) { diff --git a/windows/darklaf_cpp.eclipseformat.xml b/darklaf_cpp.eclipseformat.xml similarity index 100% rename from windows/darklaf_cpp.eclipseformat.xml rename to darklaf_cpp.eclipseformat.xml diff --git a/windows/build.gradle.kts b/windows/build.gradle.kts index 9fbc559c..4ac1253d 100644 --- a/windows/build.gradle.kts +++ b/windows/build.gradle.kts @@ -1,4 +1,4 @@ -import com.github.vlsi.gradle.properties.dsl.props + plugins { `jni-library` @@ -39,18 +39,3 @@ library { ) } } - -val skipAutostyle by props() - -if (!skipAutostyle) { - autostyle { - cpp { - licenseHeader(File("${project.rootDir}/LICENSE").readText()) - trimTrailingWhitespace() - endWithNewline() - eclipse { - configFile("darklaf_cpp.eclipseformat.xml") - } - } - } -}