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.

Sign up for GitHub

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

Jump to bottom

ktfmt + jdk22 + gradle actions v4 #653

Merged
merged 4 commits into from
Aug 28, 2024
Merged

ktfmt + jdk22 + gradle actions v4 #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e321d48
Update dependency com.facebook:ktfmt to v0.52
renovate[bot] Aug 23, 2024
d1defc4
JDK 22 too
ZacSweers Aug 28, 2024
edcd27b
Update CI + formatting
ZacSweers Aug 28, 2024
aa3b937
Merge branch 'main' into renovate/ktfmt
ZacSweers Aug 28, 2024
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
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '21'
java-version: '22'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand All @@ -52,7 +55,10 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '21'
java-version: '22'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ agp = "8.5.2"
autoService = "1.1.1"
gjf = "1.17.0"
incap = "1.0.0"
jdk = "21"
jdk = "22"
jvmTarget = "11"
kotlin = "2.0.20"
kotlinCompileTesting = "0.5.1"
kotlinpoet = "1.18.1"
ksp = "2.0.20-1.0.24"
ktfmt = "0.51"
ktfmt = "0.52"
moshi = "1.15.1"
okhttp = "4.12.0"
retrofit = "2.11.0"
Expand All @@ -37,7 +37,7 @@ lint = { id = "com.android.lint", version = "8.7.0-alpha08" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
moshix = { id = "dev.zacsweers.moshix", version = "0.28.0" } # Always replaced by the local plugin
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA2" }

[libraries]
agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
Expand Down
6 changes: 4 additions & 2 deletions moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/KtTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ internal data class KtConstructor(
}

if (!isDefault) {
@Suppress("UNCHECKED_CAST") return jvm.newInstance(*arguments.toTypedArray()) as R
@Suppress("UNCHECKED_CAST")
return jvm.newInstance(*arguments.toTypedArray()) as R
}

masks += mask
Expand All @@ -159,7 +160,8 @@ internal data class KtConstructor(
// DefaultConstructorMarker
arguments += null

@Suppress("UNCHECKED_CAST") return jvm.newInstance(*arguments.toTypedArray()) as R
@Suppress("UNCHECKED_CAST")
return jvm.newInstance(*arguments.toTypedArray()) as R
}

companion object {
Expand Down