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

Update dependencies #1240

Merged
merged 2 commits into from Apr 21, 2022
Merged

Update dependencies #1240

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a4fa0
Update dependencies
Egorand Apr 19, 2022
abbcc17
Fix type argument mapping when processing typealiases with KSP
Egorand Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ allprojects {
subprojects {
tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn")
freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
}
}
// Ensure "org.gradle.jvm.version" is set to "8" in Gradle metadata.
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Expand Up @@ -13,14 +13,14 @@
# limitations under the License.

[versions]
kotlin = "1.6.10"
kct = "1.4.6"
ksp = "1.6.0-1.0.1"
kotlin = "1.6.21"
kct = "1.4.8"
ksp = "1.6.20-1.0.5"
ktlint = "0.42.1"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
dokka = { id = "org.jetbrains.dokka", version = "1.6.10" }
dokka = { id = "org.jetbrains.dokka", version = "1.6.20" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
spotless = { id = "com.diffplug.spotless", version = "6.2.1" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" }
Expand Down
5 changes: 4 additions & 1 deletion interop/kotlinx-metadata/build.gradle.kts
View file
Open in desktop
Expand Up @@ -22,7 +22,10 @@ tasks.jar {

tasks.compileTestKotlin {
kotlinOptions {
freeCompilerArgs = listOf("-Xjvm-default=all")
freeCompilerArgs = listOf(
"-Xjvm-default=all",
"-opt-in=com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview",
)
}
}

Expand Down
2 changes: 1 addition & 1 deletion interop/ksp/test-processor/build.gradle.kts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ plugins {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
@Suppress("SuspiciousCollectionReassignment")
freeCompilerArgs += listOf("-Xopt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview")
freeCompilerArgs += listOf("-opt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview")
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt
View file
Open in desktop
Expand Up @@ -300,8 +300,8 @@ class TestProcessorTest {
public class Example {
public fun aliases(
aliasedName: String,
genericAlias: List<String>,
genericMapAlias: Map<Int, String>,
genericAlias: List,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ZacSweers this looks like a regression in KSP?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we need to fix something on the kotlinpoet side. Behavior change rather than a regression

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can take a look.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

square/moshi#1530

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ZacSweers PTAL! abbcc17

genericMapAlias: Map<String, Int>,
): Unit {
}
}
Expand Down
2 changes: 1 addition & 1 deletion kotlinpoet/build.gradle.kts
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ tasks.jar {

tasks.compileTestKotlin {
kotlinOptions {
freeCompilerArgs = listOf("-Xopt-in=com.squareup.kotlinpoet.DelicateKotlinPoetApi")
freeCompilerArgs = listOf("-opt-in=com.squareup.kotlinpoet.DelicateKotlinPoetApi")
}
}

Expand Down