Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update maven.ktlint to v1.0.1 #119

Merged
merged 2 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ max_line_length = 140
indent_size = 4
ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
ktlint_standard_property-naming = disabled
ktlint_standard_property-naming = disabled
ktlint_code_style = intellij_idea
6 changes: 3 additions & 3 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- uses: gradle/wrapper-validation-action@v1

Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
matrix:
os: [ ubuntu-latest, windows-latest ]
gradle: [ current, release-candidate ]
java: [ 17, 20 ]
java: [ 17, 21 ]
include:
- os: ubuntu-latest
gradle: 7.6
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
fail-fast: false
matrix:
gradle: [ current, release-candidate ]
java: [ 20 ]
java: [ 21 ]
agp: ${{ fromJSON(needs.provide-agp-version-matrix.outputs.agp-versions) }}

name: '[android] Gradle: ${{ matrix.gradle }}, Java: ${{ matrix.java }}, AGP: ${{ matrix.agp }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- name: Assemble
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/diffuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- uses: actions/cache@v3
name: Download base
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- uses: gradle/gradle-build-action@v2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- name: Build app with Gradle
uses: gradle/gradle-build-action@v2
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 20
java-version: 21

- uses: gradle/gradle-build-action@v2

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ allprojects {
}
}
kotlin {
jvmToolchain(20)
jvmToolchain(21)
}
}
pluginManager.withPlugin("java") {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ google-agp = "8.1.2"
google-ksp = "1.9.10-1.0.13"
maven-junit = "5.10.0"
maven-assertj = "3.24.2"
maven-ktlint = "1.0.0"
maven-ktlint = "1.0.1"
maven-commons = "2.14.0"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {


kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

def targetJavaVersion = JavaVersion.VERSION_11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ internal class EditorConfigTest : WithGradleTest.Kotlin() {
fun `lintTask uses default indentation if editorconfig absent`() {
projectRoot.resolve("src/main/kotlin/FourSpacesByDefault.kt") {
writeText(
""" |
|object FourSpacesByDefault {
""" |object FourSpacesByDefault {
| val text: String
|}
|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ class ThirdPartyPlugins : WithGradleTest.Android() {
// language=groovy
writeText(
"""
import org.gradle.api.JavaVersion
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile

plugins {
id 'org.jetbrains.kotlin.jvm'
id 'com.google.devtools.ksp'
Expand All @@ -27,7 +30,19 @@ class ThirdPartyPlugins : WithGradleTest.Android() {
repositories.mavenCentral()

dependencies {
ksp "com.google.dagger:dagger-compiler:2.48"
ksp "com.google.dagger:dagger-compiler:2.48.1"
}

kotlin {
jvmToolchain(21)
}

def targetJavaVersion = JavaVersion.VERSION_17
tasks.withType(JavaCompile).configureEach {
options.release.set(targetJavaVersion.majorVersion.toInteger())
}
tasks.withType(KotlinCompile).configureEach {
kotlinOptions.jvmTarget = targetJavaVersion
}

""".trimIndent(),
Expand Down Expand Up @@ -96,7 +111,6 @@ class ThirdPartyPlugins : WithGradleTest.Android() {
}
}


repositories.mavenCentral()

dependencies {
Expand Down
Loading