Skip to content

Commit

Permalink
remove spotless. use 8. (#98)
Browse files Browse the repository at this point in the history
  • Loading branch information
portlek authored Feb 15, 2024
1 parent d83c8a7 commit 1b25583
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '8'

- uses: arduino/setup-protoc@v1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '8'

- uses: arduino/setup-protoc@v1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '8'

- uses: arduino/setup-protoc@v1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '8'

- uses: arduino/setup-protoc@v1

Expand Down
29 changes: 0 additions & 29 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.diffplug.spotless.LineEnding
import com.google.protobuf.gradle.id

plugins {
Expand All @@ -7,7 +6,6 @@ plugins {
`maven-publish`
signing
alias(libs.plugins.protobuf)
alias(libs.plugins.spotless)
alias(libs.plugins.nexus)
}

Expand Down Expand Up @@ -94,33 +92,6 @@ tasks {
}
}

spotless {
lineEndings = LineEnding.UNIX

java {
target("**/src/main/java/tr/com/infumia/agones4j/**")
importOrder()
removeUnusedImports()
endWithNewline()
indentWithSpaces(2)
trimTrailingWhitespace()
prettier(
mapOf(
"prettier" to "3.2.5",
"prettier-plugin-java" to "2.5.0"
)
).config(
mapOf(
"parser" to "java",
"tabWidth" to 2,
"useTabs" to false,
"printWidth" to 120,
"plugins" to listOf("prettier-plugin-java"),
)
)
}
}

publishing {
publications {
val publication = create<MavenPublication>("mavenJava") {
Expand Down
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
annotationsapi = { module = "org.apache.tomcat:annotations-api", version = "6.0.53" }

[plugins]
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
protobuf = { id = "com.google.protobuf", version = "0.9.4" }
nexus = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }

0 comments on commit 1b25583

Please sign in to comment.