Update consumer project

usefulness · May 12, 2023 · a97ca7e · a97ca7e
1 parent d5e5d92
commit a97ca7e
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 15 deletions.
diff --git a/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/AndroidProjectTest.kt b/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/AndroidProjectTest.kt
@@ -44,7 +44,7 @@ internal class AndroidProjectTest : WithGradleTest.Android() {
                         
                         android {
                             namespace 'io.github.usefulness'
-                            compileSdkVersion 33
+                            compileSdk 33
                             defaultConfig {
                                 minSdkVersion 23
                             }

diff --git a/...t-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/ModifiedSourceSetsTest.kt b/...t-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/ModifiedSourceSetsTest.kt
@@ -45,7 +45,7 @@ internal class ModifiedSourceSetsTest : WithGradleTest.Android() {
                         
                         android {
                             namespace 'io.github.usefulness'
-                            compileSdkVersion 31
+                            compileSdk 31
                             defaultConfig {
                                 minSdkVersion 23
                             }

diff --git a/test-project-android/app/build.gradle b/test-project-android/app/build.gradle
@@ -8,8 +8,18 @@ ktlint {
     reporters = ["plain"]
 }
 android {
-    compileSdkVersion(33)
     namespace = "com.ktint_gradle_plugin.example"
+    defaultConfig {
+        compileSdk 33
+        minSdkVersion 26
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11
+    }
 }
 
 dependencies {

diff --git a/...ample/EmptyClassBodyInJavaSourcesClass.kt → ...ample/EmptyClassBodyInJavaSourcesClass.kt b/...ample/EmptyClassBodyInJavaSourcesClass.kt → ...ample/EmptyClassBodyInJavaSourcesClass.kt
diff --git a/...e/kotlinter/sample/EmptyClassBodyClass.kt → .../usefulness/sample/EmptyClassBodyClass.kt b/...e/kotlinter/sample/EmptyClassBodyClass.kt → .../usefulness/sample/EmptyClassBodyClass.kt
diff --git a/...gradle/kotlinter/sample/CustomRuleTest.kt → ...ithub/usefulness/sample/CustomRuleTest.kt b/...gradle/kotlinter/sample/CustomRuleTest.kt → ...ithub/usefulness/sample/CustomRuleTest.kt
diff --git a/...ilen/gradle/kotlinter/sample/OpSpacing.kt → .../io/github/usefulness/sample/OpSpacing.kt b/...ilen/gradle/kotlinter/sample/OpSpacing.kt → .../io/github/usefulness/sample/OpSpacing.kt
diff --git a/test-project-android/custom-ktlint-rules/build.gradle b/test-project-android/custom-ktlint-rules/build.gradle
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    compileOnly("com.pinterest.ktlint:ktlint-core:0.49.0")
+    compileOnly("com.pinterest.ktlint:ktlint-cli-ruleset-core:0.49.0")
 }
diff --git a/...nter/customrules/CustomRuleSetProvider.kt → ...ness/customrules/CustomRuleSetProvider.kt b/...nter/customrules/CustomRuleSetProvider.kt → ...ness/customrules/CustomRuleSetProvider.kt
@@ -1,12 +1,10 @@
 package io.github.usefulness.customrules
 
-import com.pinterest.ktlint.core.RuleProvider
 import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider
+import com.pinterest.ktlint.rule.engine.core.api.RuleSetId
 
-class CustomRuleSetProvider : RuleSetProviderV3(
-    "custom-ktlint-rules",
-    about = NO_ABOUT,
-) {
+class CustomRuleSetProvider : RuleSetProviderV3(RuleSetId("custom-ktlint-rules")) {
 
     override fun getRuleProviders() = setOf(
         RuleProvider { NoNewLineBeforeReturnTypeRule() },

diff --git a/...tomrules/NoNewLineBeforeReturnTypeRule.kt → ...tomrules/NoNewLineBeforeReturnTypeRule.kt b/...tomrules/NoNewLineBeforeReturnTypeRule.kt → ...tomrules/NoNewLineBeforeReturnTypeRule.kt
@@ -1,17 +1,20 @@
 package io.github.usefulness.customrules
 
-import com.pinterest.ktlint.core.Rule
-import com.pinterest.ktlint.core.api.EditorConfigProperties
-import com.pinterest.ktlint.core.ast.isPartOfComment
-import com.pinterest.ktlint.core.ast.isPartOfString
-import com.pinterest.ktlint.core.ast.nextLeaf
+import com.pinterest.ktlint.rule.engine.core.api.Rule
+import com.pinterest.ktlint.rule.engine.core.api.RuleId
+import com.pinterest.ktlint.rule.engine.core.api.isPartOfComment
+import com.pinterest.ktlint.rule.engine.core.api.isPartOfString
+import com.pinterest.ktlint.rule.engine.core.api.nextLeaf
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtPrimaryConstructor
 import org.jetbrains.kotlin.psi.KtSecondaryConstructor
 
-class NoNewLineBeforeReturnTypeRule : Rule("no-newline-before-return-type") {
+class NoNewLineBeforeReturnTypeRule : Rule(
+    ruleId = RuleId("custom-ktlint-rules:no-newline-before-return-type"),
+    about = About()
+) {
 
     override fun beforeVisitChildNodes(
         node: ASTNode,

diff --git a/...e/kotlinter/sample/EmptyClassBodyClass.kt → .../usefulness/sample/EmptyClassBodyClass.kt b/...e/kotlinter/sample/EmptyClassBodyClass.kt → .../usefulness/sample/EmptyClassBodyClass.kt
diff --git a/...ilen/gradle/kotlinter/sample/OpSpacing.kt → .../io/github/usefulness/sample/OpSpacing.kt b/...ilen/gradle/kotlinter/sample/OpSpacing.kt → .../io/github/usefulness/sample/OpSpacing.kt