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

Kotlin 1.7 and Compose compiler 1.2.0 #182

Merged
merged 2 commits into from
Jun 30, 2022
Merged

Kotlin 1.7 and Compose compiler 1.2.0 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e84cbec
update to Kotlin 1.7 & Compose compiler 1.2
hrach Jun 30, 2022
ed09c66
updat Ktlint to support Kotlin 1.7
hrach Jun 30, 2022
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
2 changes: 2 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[*.{kt,kts}]
ij_kotlin_imports_layout=*,^
ij_kotlin_allow_trailing_comma=true
ij_kotlin_allow_trailing_comma_on_call_site=true
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ subprojects {
jvmTarget = "1.8"
allWarningsAsErrors = true
freeCompilerArgs = freeCompilerArgs.toMutableList().apply {
add("-opt-in=kotlin.RequiresOptIn")
add("-Xskip-prerelease-check")
}.toList()
}
Expand Down
2 changes: 1 addition & 1 deletion catalog/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ android {
kotlinter {
reporters = arrayOf("json")
experimentalRules = true
disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
disabledRules = arrayOf("trailing-comma") // kotlinter/ktlint does not respect editorconfig
}

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions generator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ java {
kotlinter {
reporters = arrayOf("json")
experimentalRules = true
disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
disabledRules = arrayOf("trailing-comma") // kotlinter/ktlint does not respect editorconfig
}

dependencies {
Expand All @@ -27,16 +27,16 @@ dependencies {
}

tasks.register<JavaExec>("colors") {
mainClass.set("kiwi.orbit.compose.generator.colors.RunnerKt")
mainClass.set("kiwi.orbit.compose.generator.colors.MainKt")
classpath = sourceSets.getByName("main").runtimeClasspath
}

tasks.register<JavaExec>("icons") {
mainClass.set("kiwi.orbit.compose.generator.icons.RunnerKt")
mainClass.set("kiwi.orbit.compose.generator.icons.MainKt")
classpath = sourceSets.getByName("main").runtimeClasspath
}

tasks.register<JavaExec>("illustrations") {
mainClass.set("kiwi.orbit.compose.generator.illustrations.RunnerKt")
mainClass.set("kiwi.orbit.compose.generator.illustrations.MainKt")
classpath = sourceSets.getByName("main").runtimeClasspath
}
0 .../orbit/compose/generator/colors/runner.kt → ...wi/orbit/compose/generator/colors/Main.kt
View file
Open in desktop
File renamed without changes.
0 ...i/orbit/compose/generator/icons/runner.kt → ...iwi/orbit/compose/generator/icons/Main.kt
View file
Open in desktop
File renamed without changes.
0 ...compose/generator/illustrations/runner.kt → ...t/compose/generator/illustrations/Main.kt
View file
Open in desktop
File renamed without changes.
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 @@ -3,7 +3,7 @@
compileSdk = "32"
minSdk = "23"

kotlin-lang = "1.6.21"
kotlin-lang = "1.7.0"
android-gradle-plugin = "7.2.0"
maven-publish = "0.19.0"

Expand All @@ -14,7 +14,7 @@ androidx-core = "1.8.0"
androidx-constraint-layout = "1.0.0"
accompanist-main = "0.24.13-rc"
coil = "2.0.0"
compose-compiler = "1.2.0-rc02"
compose-compiler = "1.2.0"
compose-main = "1.2.0-rc03"
compose-navigation = "2.5.0"
square-kotlinPoet = "1.11.0"
Expand Down Expand Up @@ -56,5 +56,5 @@ square-kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "square-
[bundles]

[plugins]
kotlinter = { id = "org.jmailen.kotlinter", version = "3.10.0" }
kotlinter = { id = "org.jmailen.kotlinter", version = "3.11.1" }
paparazzi = { id = "app.cash.paparazzi", version = "1.0.0" }
2 changes: 1 addition & 1 deletion icons/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
kotlinter {
reporters = arrayOf("json")
experimentalRules = true
disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
disabledRules = arrayOf("trailing-comma") // kotlinter/ktlint does not respect editorconfig
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion illustrations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
kotlinter {
reporters = arrayOf("json")
experimentalRules = true
disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
disabledRules = arrayOf("trailing-comma") // kotlinter/ktlint does not respect editorconfig
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
kotlinter {
reporters = arrayOf("json")
experimentalRules = true
disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
disabledRules = arrayOf("trailing-comma") // kotlinter/ktlint does not respect editorconfig
}

dependencies {
Expand Down
2 changes: 2 additions & 0 deletions ui/src/main/java/kiwi/orbit/compose/ui/foundation/ColorBundleGradient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ktlint-disable filename

package kiwi.orbit.compose.ui.foundation

import androidx.compose.ui.geometry.Offset
Expand Down
2 changes: 2 additions & 0 deletions ui/src/main/java/kiwi/orbit/compose/ui/foundation/TextSelectionColors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ktlint-disable filename

package kiwi.orbit.compose.ui.foundation

import androidx.compose.foundation.text.selection.TextSelectionColors
Expand Down
2 changes: 2 additions & 0 deletions ui/src/main/java/kiwi/orbit/compose/ui/layout/ExpandModifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ktlint-disable filename

package kiwi.orbit.compose.ui.layout

import androidx.compose.ui.Modifier
Expand Down
2 changes: 2 additions & 0 deletions ui/src/main/java/kiwi/orbit/compose/ui/utils/PaddingValuesExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ktlint-disable filename

package kiwi.orbit.compose.ui.utils

import androidx.compose.foundation.layout.PaddingValues
Expand Down