Reorganized project's folders

gmazzo · Dec 18, 2023 · 7900464 · 7900464
1 parent 4ffbea1
commit 7900464
Show file tree

Hide file tree

Showing 62 changed files with 13 additions and 18 deletions.
diff --git a/demo/CODEOWNERS → demo-project/CODEOWNERS b/demo/CODEOWNERS → demo-project/CODEOWNERS
diff --git a/demo/app/build.gradle.kts → demo-project/app/build.gradle.kts b/demo/app/build.gradle.kts → demo-project/app/build.gradle.kts
@@ -32,10 +32,10 @@ android {
 }
 
 dependencies {
-    "jvmCommonMainImplementation"(projects.demo.lib1)
-    "jvmCommonMainImplementation"(projects.demo.utils)
+    "jvmCommonMainImplementation"(projects.demoProject.lib1)
+    "jvmCommonMainImplementation"(projects.demoProject.utils)
 
-    "androidMainImplementation"(projects.demo.lib2)
+    "androidMainImplementation"(projects.demoProject.lib2)
 
     commonTestImplementation(libs.kotlin.test)
 }
diff --git a/demo/app/src/androidMain/AndroidManifest.xml → ...t/app/src/androidMain/AndroidManifest.xml b/demo/app/src/androidMain/AndroidManifest.xml → ...t/app/src/androidMain/AndroidManifest.xml
diff --git a/...idUnitTest/kotlin/org/test/app/Rethrow.kt → ...idUnitTest/kotlin/org/test/app/Rethrow.kt b/...idUnitTest/kotlin/org/test/app/Rethrow.kt → ...idUnitTest/kotlin/org/test/app/Rethrow.kt
diff --git a/...ommonMain/kotlin/org/test/app/AppClass.kt → ...ommonMain/kotlin/org/test/app/AppClass.kt b/...ommonMain/kotlin/org/test/app/AppClass.kt → ...ommonMain/kotlin/org/test/app/AppClass.kt
diff --git a/...monMain/kotlin/org/test/utils/AppUtils.kt → ...monMain/kotlin/org/test/utils/AppUtils.kt b/...monMain/kotlin/org/test/utils/AppUtils.kt → ...monMain/kotlin/org/test/utils/AppUtils.kt
diff --git a/...Test/kotlin/org/test/app/AppOwnersTest.kt → ...Test/kotlin/org/test/app/AppOwnersTest.kt b/...Test/kotlin/org/test/app/AppOwnersTest.kt → ...Test/kotlin/org/test/app/AppOwnersTest.kt
diff --git a/...commonTest/kotlin/org/test/app/Rethrow.kt → ...commonTest/kotlin/org/test/app/Rethrow.kt b/...commonTest/kotlin/org/test/app/Rethrow.kt → ...commonTest/kotlin/org/test/app/Rethrow.kt
diff --git a/...src/jsTest/kotlin/org/test/app/Rethrow.kt → ...src/jsTest/kotlin/org/test/app/Rethrow.kt b/...src/jsTest/kotlin/org/test/app/Rethrow.kt → ...src/jsTest/kotlin/org/test/app/Rethrow.kt
diff --git a/...t/kotlin/org/test/app/AppOwnersJVMTest.kt → ...t/kotlin/org/test/app/AppOwnersJVMTest.kt b/...t/kotlin/org/test/app/AppOwnersJVMTest.kt → ...t/kotlin/org/test/app/AppOwnersJVMTest.kt
diff --git a/...rc/jvmTest/kotlin/org/test/app/Rethrow.kt → ...rc/jvmTest/kotlin/org/test/app/Rethrow.kt b/...rc/jvmTest/kotlin/org/test/app/Rethrow.kt → ...rc/jvmTest/kotlin/org/test/app/Rethrow.kt
diff --git a/...nativeTest/kotlin/org/test/app/Rethrow.kt → ...nativeTest/kotlin/org/test/app/Rethrow.kt b/...nativeTest/kotlin/org/test/app/Rethrow.kt → ...nativeTest/kotlin/org/test/app/Rethrow.kt
diff --git a/demo/build.gradle.kts → demo-project/build.gradle.kts b/demo/build.gradle.kts → demo-project/build.gradle.kts
diff --git a/demo/lib1/build.gradle.kts → demo-project/lib1/build.gradle.kts b/demo/lib1/build.gradle.kts → demo-project/lib1/build.gradle.kts
@@ -10,7 +10,7 @@ kotlin {
 }
 
 dependencies {
-    api(projects.demo.utils)
+    api(projects.demoProject.utils)
 
     testImplementation(libs.kotlin.test)
 }
diff --git a/demo/lib1/gradle.properties → demo-project/lib1/gradle.properties b/demo/lib1/gradle.properties → demo-project/lib1/gradle.properties
diff --git a/.../src/main/kotlin/org/test/lib/LibClass.kt → .../src/main/kotlin/org/test/lib/LibClass.kt b/.../src/main/kotlin/org/test/lib/LibClass.kt → .../src/main/kotlin/org/test/lib/LibClass.kt
diff --git a/...rc/main/kotlin/org/test/utils/LibUtils.kt → ...rc/main/kotlin/org/test/utils/LibUtils.kt b/...rc/main/kotlin/org/test/utils/LibUtils.kt → ...rc/main/kotlin/org/test/utils/LibUtils.kt
diff --git a/...test/kotlin/org/test/lib/LibOwnersTest.kt → ...test/kotlin/org/test/lib/LibOwnersTest.kt b/...test/kotlin/org/test/lib/LibOwnersTest.kt → ...test/kotlin/org/test/lib/LibOwnersTest.kt
diff --git a/demo/lib2/build.gradle.kts → demo-project/lib2/build.gradle.kts b/demo/lib2/build.gradle.kts → demo-project/lib2/build.gradle.kts
@@ -16,7 +16,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.demo.lib1)
+    implementation(projects.demoProject.lib1)
 
     testImplementation(libs.kotlin.test)
 }
diff --git a/.../kotlin/org/test/utils/AndroidLibUtils.kt → .../kotlin/org/test/utils/AndroidLibUtils.kt b/.../kotlin/org/test/utils/AndroidLibUtils.kt → .../kotlin/org/test/utils/AndroidLibUtils.kt
diff --git a/...tlin/org/test/lib/AndroidLibOwnersTest.kt → ...tlin/org/test/lib/AndroidLibOwnersTest.kt b/...tlin/org/test/lib/AndroidLibOwnersTest.kt → ...tlin/org/test/lib/AndroidLibOwnersTest.kt
diff --git a/demo/utils/build.gradle.kts → demo-project/utils/build.gradle.kts b/demo/utils/build.gradle.kts → demo-project/utils/build.gradle.kts
diff --git a/...src/main/kotlin/org/test/utils/Rethrow.kt → ...src/main/kotlin/org/test/utils/Rethrow.kt b/...src/main/kotlin/org/test/utils/Rethrow.kt → ...src/main/kotlin/org/test/utils/Rethrow.kt
diff --git a/...s/src/main/kotlin/org/test/utils/Utils.kt → ...s/src/main/kotlin/org/test/utils/Utils.kt b/...s/src/main/kotlin/org/test/utils/Utils.kt → ...s/src/main/kotlin/org/test/utils/Utils.kt
diff --git a/...n/kotlin/org/test/utils/more/MoreUtils.kt → ...n/kotlin/org/test/utils/more/MoreUtils.kt b/...n/kotlin/org/test/utils/more/MoreUtils.kt → ...n/kotlin/org/test/utils/more/MoreUtils.kt
diff --git a/.../java/org/test/utils/UtilsOwnersTest.java → .../java/org/test/utils/UtilsOwnersTest.java b/.../java/org/test/utils/UtilsOwnersTest.java → .../java/org/test/utils/UtilsOwnersTest.java
diff --git a/gradle-plugin/build.gradle.kts → plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts → plugin/build.gradle.kts
diff --git a/gradle-plugin/buildSrc/build.gradle.kts → plugin/buildSrc/build.gradle.kts b/gradle-plugin/buildSrc/build.gradle.kts → plugin/buildSrc/build.gradle.kts
diff --git a/gradle-plugin/buildSrc/settings.gradle.kts → plugin/buildSrc/settings.gradle.kts b/gradle-plugin/buildSrc/settings.gradle.kts → plugin/buildSrc/settings.gradle.kts
diff --git a/...rc/main/kotlin/build-constants.gradle.kts → ...rc/main/kotlin/build-constants.gradle.kts b/...rc/main/kotlin/build-constants.gradle.kts → ...rc/main/kotlin/build-constants.gradle.kts
diff --git a/...n/kotlin/embedded-dependencies.gradle.kts → ...n/kotlin/embedded-dependencies.gradle.kts b/...n/kotlin/embedded-dependencies.gradle.kts → ...n/kotlin/embedded-dependencies.gradle.kts
diff --git a/...src/main/kotlin/git-versioning.gradle.kts → ...src/main/kotlin/git-versioning.gradle.kts b/...src/main/kotlin/git-versioning.gradle.kts → ...src/main/kotlin/git-versioning.gradle.kts
diff --git a/...n/kotlin/jvm-convention-module.gradle.kts → ...n/kotlin/jvm-convention-module.gradle.kts b/...n/kotlin/jvm-convention-module.gradle.kts → ...n/kotlin/jvm-convention-module.gradle.kts
diff --git a/...n/kotlin/maven-central-publish.gradle.kts → ...n/kotlin/maven-central-publish.gradle.kts b/...n/kotlin/maven-central-publish.gradle.kts → ...n/kotlin/maven-central-publish.gradle.kts
diff --git a/gradle-plugin/compiler/build.gradle.kts → plugin/compiler/build.gradle.kts b/gradle-plugin/compiler/build.gradle.kts → plugin/compiler/build.gradle.kts
diff --git a/...ompiler/CodeOwnersCommandLineProcessor.kt → ...ompiler/CodeOwnersCommandLineProcessor.kt b/...ompiler/CodeOwnersCommandLineProcessor.kt → ...ompiler/CodeOwnersCommandLineProcessor.kt
@@ -4,9 +4,9 @@ package io.github.gmazzo.codeowners.compiler
 
 import io.github.gmazzo.codeowners.compiler.BuildConfig.ARG_CODEOWNERS_FILE
 import io.github.gmazzo.codeowners.compiler.BuildConfig.ARG_CODEOWNERS_ROOT
-import org.jetbrains.kotlin.config.CompilerConfiguration
 import io.github.gmazzo.codeowners.compiler.BuildConfig.COMPILER_PLUGIN_ID
 import org.jetbrains.kotlin.compiler.plugin.*
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import java.io.File
 
 internal class CodeOwnersCommandLineProcessor : CommandLineProcessor {

diff --git a/.../compiler/CodeOwnersComponentRegistrar.kt → .../compiler/CodeOwnersComponentRegistrar.kt b/.../compiler/CodeOwnersComponentRegistrar.kt → .../compiler/CodeOwnersComponentRegistrar.kt
diff --git a/...s/compiler/CodeOwnersConfigurationKeys.kt → ...s/compiler/CodeOwnersConfigurationKeys.kt b/...s/compiler/CodeOwnersConfigurationKeys.kt → ...s/compiler/CodeOwnersConfigurationKeys.kt
diff --git a/...mpiler/CodeOwnersIrGenerationExtension.kt → ...mpiler/CodeOwnersIrGenerationExtension.kt b/...mpiler/CodeOwnersIrGenerationExtension.kt → ...mpiler/CodeOwnersIrGenerationExtension.kt
diff --git a/...wners/compiler/CodeOwnersIrTransformer.kt → ...wners/compiler/CodeOwnersIrTransformer.kt b/...wners/compiler/CodeOwnersIrTransformer.kt → ...wners/compiler/CodeOwnersIrTransformer.kt
diff --git a/...tlin.compiler.plugin.CommandLineProcessor → ...tlin.compiler.plugin.CommandLineProcessor b/...tlin.compiler.plugin.CommandLineProcessor → ...tlin.compiler.plugin.CommandLineProcessor
diff --git a/...n.compiler.plugin.CompilerPluginRegistrar → ...n.compiler.plugin.CompilerPluginRegistrar b/...n.compiler.plugin.CompilerPluginRegistrar → ...n.compiler.plugin.CompilerPluginRegistrar
diff --git a/gradle-plugin/core/build.gradle.kts → plugin/core/build.gradle.kts b/gradle-plugin/core/build.gradle.kts → plugin/core/build.gradle.kts
diff --git a/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt b/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt
diff --git a/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt b/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt
diff --git a/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt b/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt
diff --git a/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt b/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt
diff --git a/...ub/gmazzo/codeowners/CodeOwnersJVMTest.kt → ...ub/gmazzo/codeowners/CodeOwnersJVMTest.kt b/...ub/gmazzo/codeowners/CodeOwnersJVMTest.kt → ...ub/gmazzo/codeowners/CodeOwnersJVMTest.kt
diff --git a/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt b/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt
diff --git a/gradle-plugin/matcher/build.gradle.kts → plugin/matcher/build.gradle.kts b/gradle-plugin/matcher/build.gradle.kts → plugin/matcher/build.gradle.kts
diff --git a/...azzo/codeowners/matcher/CodeOwnersFile.kt → ...azzo/codeowners/matcher/CodeOwnersFile.kt b/...azzo/codeowners/matcher/CodeOwnersFile.kt → ...azzo/codeowners/matcher/CodeOwnersFile.kt
diff --git a/...o/codeowners/matcher/CodeOwnersMatcher.kt → ...o/codeowners/matcher/CodeOwnersMatcher.kt b/...o/codeowners/matcher/CodeOwnersMatcher.kt → ...o/codeowners/matcher/CodeOwnersMatcher.kt
diff --git a/.../codeowners/matcher/CodeOwnersFileTest.kt → .../codeowners/matcher/CodeOwnersFileTest.kt b/.../codeowners/matcher/CodeOwnersFileTest.kt → .../codeowners/matcher/CodeOwnersFileTest.kt
diff --git a/gradle-plugin/plugin/build.gradle.kts → plugin/plugin/build.gradle.kts b/gradle-plugin/plugin/build.gradle.kts → plugin/plugin/build.gradle.kts
diff --git a/...n/plugin/src/main/kotlin/CodeOwnersDSL.kt → ...n/plugin/src/main/kotlin/CodeOwnersDSL.kt b/...n/plugin/src/main/kotlin/CodeOwnersDSL.kt → ...n/plugin/src/main/kotlin/CodeOwnersDSL.kt
diff --git a/...eowners/CodeOwnersCompilationExtension.kt → ...eowners/CodeOwnersCompilationExtension.kt b/...eowners/CodeOwnersCompilationExtension.kt → ...eowners/CodeOwnersCompilationExtension.kt
diff --git a/.../gmazzo/codeowners/CodeOwnersExtension.kt → .../gmazzo/codeowners/CodeOwnersExtension.kt b/.../gmazzo/codeowners/CodeOwnersExtension.kt → .../gmazzo/codeowners/CodeOwnersExtension.kt
diff --git a/...hub/gmazzo/codeowners/CodeOwnersPlugin.kt → ...hub/gmazzo/codeowners/CodeOwnersPlugin.kt b/...hub/gmazzo/codeowners/CodeOwnersPlugin.kt → ...hub/gmazzo/codeowners/CodeOwnersPlugin.kt
diff --git a/...gmazzo/codeowners/CodeOwnersReportTask.kt → ...gmazzo/codeowners/CodeOwnersReportTask.kt b/...gmazzo/codeowners/CodeOwnersReportTask.kt → ...gmazzo/codeowners/CodeOwnersReportTask.kt
diff --git a/...gmazzo/codeowners/CodeOwnersPluginTest.kt → ...gmazzo/codeowners/CodeOwnersPluginTest.kt b/...gmazzo/codeowners/CodeOwnersPluginTest.kt → ...gmazzo/codeowners/CodeOwnersPluginTest.kt
@@ -4,7 +4,6 @@ import io.github.gmazzo.codeowners.plugin.BuildConfig
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.exclude
-import org.gradle.kotlin.dsl.withType
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

diff --git a/gradle-plugin/settings.gradle.kts → plugin/settings.gradle.kts b/gradle-plugin/settings.gradle.kts → plugin/settings.gradle.kts
@@ -12,8 +12,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "gradle-codeowners-plugin"
-
 include(
     "compiler",
     "core",

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,15 +16,13 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name "gradle-codeowners-plugin"
-
-includeBuild("gradle-plugin")
-include("demo")
+rootProject.name = "gradle-codeowners-plugin"
 
+includeBuild("plugin")
 include(
-    "demo",
-    "demo:app",
-    "demo:lib1",
-    "demo:lib2",
-    "demo:utils",
+    "demo-project",
+    "demo-project:app",
+    "demo-project:lib1",
+    "demo-project:lib2",
+    "demo-project:utils",
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,8 +12,6 @@ dependencyResolutionManagement { @@
         }
     }
-    rootProject.name = "gradle-codeowners-plugin"
     include(
         "compiler",
         "core",
@@ Expand Down @@