fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-18 23:49:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish spotless license header configuration (#1231)

Browse Source 
* Update spotless and enable copyright header bits again

* Reformat square copyright headers

* Create separate format configuration for external files

* Update CI to use java 15 final

* include stacktrace in ci failures

* Update ktlint to 0.39

* Disable java formatting on JDK 15

* Fix google header
This commit is contained in:
Zac Sweers
2020-09-25 22:18:51 -04:00
committed by GitHub
parent bf72ce8ade
commit a1852a7315
99 changed files with 263 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
build.gradle.kts
View File

@@ -14,6 +14,7 @@
* limitations under the License.
*/
import com.diffplug.gradle.spotless.JavaExtension
import org.gradle.jvm.tasks.Jar
buildscript {
@@ -25,7 +26,7 @@ buildscript {
plugins {
id("com.vanniktech.maven.publish") version "0.12.0" apply false
id("org.jetbrains.dokka") version "0.10.1" apply false
id("com.diffplug.spotless") version "5.2.0"
id("com.diffplug.spotless") version "5.5.0"
}
spotless {
@@ -35,22 +36,59 @@ spotless {
indentWithSpaces(2)
endWithNewline()
}
java {
googleJavaFormat("1.7")
target("**/*.java")
targetExclude("**/spotless.java")
// https://github.com/diffplug/spotless/issues/677
// licenseHeaderFile("spotless/spotless.java")
// GJF not compatible with JDK 15 yet
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
val externalJavaFiles = arrayOf(
"**/ClassFactory.java",
"**/Iso8601Utils.java",
"**/JsonReader.java",
"**/JsonReaderPathTest.java",
"**/JsonReaderTest.java",
"**/JsonScope.java",
"**/JsonUtf8Reader.java",
"**/JsonUtf8ReaderPathTest.java",
"**/JsonUtf8ReaderTest.java",
"**/JsonUtf8ReaderTest.java",
"**/JsonUtf8Writer.java",
"**/JsonUtf8WriterTest.java",
"**/JsonWriter.java",
"**/JsonWriterPathTest.java",
"**/JsonWriterTest.java",
"**/LinkedHashTreeMap.java",
"**/LinkedHashTreeMapTest.java",
"**/PolymorphicJsonAdapterFactory.java",
"**/RecursiveTypesResolveTest.java",
"**/Types.java",
"**/TypesTest.java"
)
val configureCommonJavaFormat: JavaExtension.() -> Unit = {
googleJavaFormat("1.7")
}
java {
configureCommonJavaFormat()
target("**/*.java")
targetExclude(
"**/spotless.java",
"**/build/**",
*externalJavaFiles
)
licenseHeaderFile("spotless/spotless.java")
}
format("externalJava", JavaExtension::class.java) {
// These don't use our spotless config for header files since we don't want to overwrite the
// existing copyright headers.
configureCommonJavaFormat()
target(*externalJavaFiles)
}
}
kotlin {
ktlint(Dependencies.ktlintVersion).userData(mapOf("indent_size" to "2"))
target("**/*.kt")
trimTrailingWhitespace()
endWithNewline()
// https://github.com/diffplug/spotless/issues/677
// licenseHeaderFile("spotless/spotless.kt")
// .updateYearWithLatest(false)
// targetExclude("**/Dependencies.kt", "**/spotless.kt")
licenseHeaderFile("spotless/spotless.kt")
.updateYearWithLatest(false)
targetExclude("**/Dependencies.kt", "**/spotless.kt", "**/build/**")
}
kotlinGradle {
ktlint(Dependencies.ktlintVersion).userData(mapOf("indent_size" to "2"))