From 0fc2c9827806957f3b78994289e8c0c31fb06d70 Mon Sep 17 00:00:00 2001 From: Alexey Illarionov <alexey@0xdc.ru> Date: Sun, 19 May 2024 09:32:00 +0300 Subject: [PATCH] Remove common package from paths following Kotlin Code Conventions --- .../convention/{project/android => }/AndroidCommon.kt | 0 .../convention/{project/android => }/AndroidCompose.kt | 0 .../{project/android => }/AndroidSigningConfig.kt | 0 .../convention/{project/android => }/AndroidUnitTests.kt | 0 .../{project/android => }/PixnewsExtensionApplicator.kt | 0 .../convention/{project/android => }/ReleaseConfig.kt | 0 .../{project/android => }/application.gradle.kts | 0 .../{project/android => }/crashlytics.gradle.kts | 0 .../convention/{project/android => }/library.gradle.kts | 0 .../{project/android => }/room-kapt.gradle.kts | 0 .../convention/{project/android => }/room.gradle.kts | 0 .../{project/android => }/test-instrumented.gradle.kts | 0 .../android => }/test.compose.screenshot.gradle.kts | 0 .../convention/{project/android => }/test.gradle.kts | 0 .../src/main/kotlin/{project/base => }/Extensions.kt | 0 .../main/kotlin/{project/base => }/PixnewsExtension.kt | 0 .../src/main/kotlin/{project/base => }/UnitTestEngine.kt | 0 .../{project/base => }/compose/ComposeMetricsHelper.kt | 0 .../src/main/kotlin/{project => }/config.igdb.gradle.kts | 0 .../{project => }/config/igdb/GenerateIgdbOptionsTask.kt | 0 .../kotlin/{project => }/config/igdb/IgdbConfigReader.kt | 0 .../{project => }/config/igdb/IgdbOptionsGenerator.kt | 0 .../kotlin/{project => }/config/igdb/LocalIgdbOptions.kt | 0 .../config/igdb/LocalIgdbOptionsValueSource.kt | 0 .../{project => }/config/util/AndroidGradlePluginExt.kt | 0 .../config/util/PixnewsConfigPropertyExt.kt | 0 .../main/kotlin/{project => }/config/util/StringExt.kt | 0 gradle/plugin/project/config/src/test/kotlin/Dummy.kt | 9 +++++++++ .../{project => }/config/igdb/IgdbConfigReaderTest.kt | 0 .../config/igdb/IgdbOptionsGeneratorTest.kt | 0 .../{project/di => }/anvil-factories.gradle.kts | 0 .../di/convention/{project/di => }/anvil-kapt.gradle.kts | 0 .../{project/kotlin => }/UnpackAarClassesTransform.kt | 0 .../{project/kotlin => }/compose-compiler.gradle.kts | 0 .../convention/{project/kotlin => }/library.gradle.kts | 0 .../convention/{project/lint => }/CommonAndroidLint.kt | 0 .../lint/convention/{project/lint => }/LintConfig.kt | 0 .../{project/lint => }/android-lint-noagp.gradle.kts | 0 .../{project/lint => }/android-lint.gradle.kts | 0 .../lint/convention/{project/lint => }/detekt.gradle.kts | 0 .../lint/convention/{project/lint => }/diktat.gradle.kts | 0 .../convention/{project/lint => }/spotless.gradle.kts | 0 .../convention/{project => }/protobuf-wire.gradle.kts | 0 .../convention/{project/testing => }/graalvm.gradle.kts | 0 .../graalvm/GraalvmCompilerJvmArgumentsProvider.kt | 0 .../{project/testing => }/graalvm/ProviderExt.kt | 0 .../{project/testing => }/TestCommonConfiguration.kt | 0 .../convention/{settings => }/common.settings.gradle.kts | 0 .../{settings => }/gradle-enterprise.settings.gradle.kts | 0 .../{settings => }/repositories.settings.gradle.kts | 0 .../convention/{settings => }/root.settings.gradle.kts | 0 51 files changed, 9 insertions(+) rename gradle/plugin/project/android/convention/{project/android => }/AndroidCommon.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/AndroidCompose.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/AndroidSigningConfig.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/AndroidUnitTests.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/PixnewsExtensionApplicator.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/ReleaseConfig.kt (100%) rename gradle/plugin/project/android/convention/{project/android => }/application.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/crashlytics.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/library.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/room-kapt.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/room.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/test-instrumented.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/test.compose.screenshot.gradle.kts (100%) rename gradle/plugin/project/android/convention/{project/android => }/test.gradle.kts (100%) rename gradle/plugin/project/base/src/main/kotlin/{project/base => }/Extensions.kt (100%) rename gradle/plugin/project/base/src/main/kotlin/{project/base => }/PixnewsExtension.kt (100%) rename gradle/plugin/project/base/src/main/kotlin/{project/base => }/UnitTestEngine.kt (100%) rename gradle/plugin/project/base/src/main/kotlin/{project/base => }/compose/ComposeMetricsHelper.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config.igdb.gradle.kts (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/igdb/GenerateIgdbOptionsTask.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/igdb/IgdbConfigReader.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/igdb/IgdbOptionsGenerator.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/igdb/LocalIgdbOptions.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/igdb/LocalIgdbOptionsValueSource.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/util/AndroidGradlePluginExt.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/util/PixnewsConfigPropertyExt.kt (100%) rename gradle/plugin/project/config/src/main/kotlin/{project => }/config/util/StringExt.kt (100%) create mode 100644 gradle/plugin/project/config/src/test/kotlin/Dummy.kt rename gradle/plugin/project/config/src/test/kotlin/{project => }/config/igdb/IgdbConfigReaderTest.kt (100%) rename gradle/plugin/project/config/src/test/kotlin/{project => }/config/igdb/IgdbOptionsGeneratorTest.kt (100%) rename gradle/plugin/project/di/convention/{project/di => }/anvil-factories.gradle.kts (100%) rename gradle/plugin/project/di/convention/{project/di => }/anvil-kapt.gradle.kts (100%) rename gradle/plugin/project/kotlin/convention/{project/kotlin => }/UnpackAarClassesTransform.kt (100%) rename gradle/plugin/project/kotlin/convention/{project/kotlin => }/compose-compiler.gradle.kts (100%) rename gradle/plugin/project/kotlin/convention/{project/kotlin => }/library.gradle.kts (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/CommonAndroidLint.kt (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/LintConfig.kt (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/android-lint-noagp.gradle.kts (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/android-lint.gradle.kts (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/detekt.gradle.kts (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/diktat.gradle.kts (100%) rename gradle/plugin/project/lint/convention/{project/lint => }/spotless.gradle.kts (100%) rename gradle/plugin/project/protobuf/convention/{project => }/protobuf-wire.gradle.kts (100%) rename gradle/plugin/project/testing-graalvm/convention/{project/testing => }/graalvm.gradle.kts (100%) rename gradle/plugin/project/testing-graalvm/convention/{project/testing => }/graalvm/GraalvmCompilerJvmArgumentsProvider.kt (100%) rename gradle/plugin/project/testing-graalvm/convention/{project/testing => }/graalvm/ProviderExt.kt (100%) rename gradle/plugin/project/testing/src/main/kotlin/{project/testing => }/TestCommonConfiguration.kt (100%) rename gradle/plugin/settings/convention/{settings => }/common.settings.gradle.kts (100%) rename gradle/plugin/settings/convention/{settings => }/gradle-enterprise.settings.gradle.kts (100%) rename gradle/plugin/settings/convention/{settings => }/repositories.settings.gradle.kts (100%) rename gradle/plugin/settings/convention/{settings => }/root.settings.gradle.kts (100%) diff --git a/gradle/plugin/project/android/convention/project/android/AndroidCommon.kt b/gradle/plugin/project/android/convention/AndroidCommon.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/AndroidCommon.kt rename to gradle/plugin/project/android/convention/AndroidCommon.kt diff --git a/gradle/plugin/project/android/convention/project/android/AndroidCompose.kt b/gradle/plugin/project/android/convention/AndroidCompose.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/AndroidCompose.kt rename to gradle/plugin/project/android/convention/AndroidCompose.kt diff --git a/gradle/plugin/project/android/convention/project/android/AndroidSigningConfig.kt b/gradle/plugin/project/android/convention/AndroidSigningConfig.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/AndroidSigningConfig.kt rename to gradle/plugin/project/android/convention/AndroidSigningConfig.kt diff --git a/gradle/plugin/project/android/convention/project/android/AndroidUnitTests.kt b/gradle/plugin/project/android/convention/AndroidUnitTests.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/AndroidUnitTests.kt rename to gradle/plugin/project/android/convention/AndroidUnitTests.kt diff --git a/gradle/plugin/project/android/convention/project/android/PixnewsExtensionApplicator.kt b/gradle/plugin/project/android/convention/PixnewsExtensionApplicator.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/PixnewsExtensionApplicator.kt rename to gradle/plugin/project/android/convention/PixnewsExtensionApplicator.kt diff --git a/gradle/plugin/project/android/convention/project/android/ReleaseConfig.kt b/gradle/plugin/project/android/convention/ReleaseConfig.kt similarity index 100% rename from gradle/plugin/project/android/convention/project/android/ReleaseConfig.kt rename to gradle/plugin/project/android/convention/ReleaseConfig.kt diff --git a/gradle/plugin/project/android/convention/project/android/application.gradle.kts b/gradle/plugin/project/android/convention/application.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/application.gradle.kts rename to gradle/plugin/project/android/convention/application.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/crashlytics.gradle.kts b/gradle/plugin/project/android/convention/crashlytics.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/crashlytics.gradle.kts rename to gradle/plugin/project/android/convention/crashlytics.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/library.gradle.kts b/gradle/plugin/project/android/convention/library.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/library.gradle.kts rename to gradle/plugin/project/android/convention/library.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/room-kapt.gradle.kts b/gradle/plugin/project/android/convention/room-kapt.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/room-kapt.gradle.kts rename to gradle/plugin/project/android/convention/room-kapt.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/room.gradle.kts b/gradle/plugin/project/android/convention/room.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/room.gradle.kts rename to gradle/plugin/project/android/convention/room.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/test-instrumented.gradle.kts b/gradle/plugin/project/android/convention/test-instrumented.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/test-instrumented.gradle.kts rename to gradle/plugin/project/android/convention/test-instrumented.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/test.compose.screenshot.gradle.kts b/gradle/plugin/project/android/convention/test.compose.screenshot.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/test.compose.screenshot.gradle.kts rename to gradle/plugin/project/android/convention/test.compose.screenshot.gradle.kts diff --git a/gradle/plugin/project/android/convention/project/android/test.gradle.kts b/gradle/plugin/project/android/convention/test.gradle.kts similarity index 100% rename from gradle/plugin/project/android/convention/project/android/test.gradle.kts rename to gradle/plugin/project/android/convention/test.gradle.kts diff --git a/gradle/plugin/project/base/src/main/kotlin/project/base/Extensions.kt b/gradle/plugin/project/base/src/main/kotlin/Extensions.kt similarity index 100% rename from gradle/plugin/project/base/src/main/kotlin/project/base/Extensions.kt rename to gradle/plugin/project/base/src/main/kotlin/Extensions.kt diff --git a/gradle/plugin/project/base/src/main/kotlin/project/base/PixnewsExtension.kt b/gradle/plugin/project/base/src/main/kotlin/PixnewsExtension.kt similarity index 100% rename from gradle/plugin/project/base/src/main/kotlin/project/base/PixnewsExtension.kt rename to gradle/plugin/project/base/src/main/kotlin/PixnewsExtension.kt diff --git a/gradle/plugin/project/base/src/main/kotlin/project/base/UnitTestEngine.kt b/gradle/plugin/project/base/src/main/kotlin/UnitTestEngine.kt similarity index 100% rename from gradle/plugin/project/base/src/main/kotlin/project/base/UnitTestEngine.kt rename to gradle/plugin/project/base/src/main/kotlin/UnitTestEngine.kt diff --git a/gradle/plugin/project/base/src/main/kotlin/project/base/compose/ComposeMetricsHelper.kt b/gradle/plugin/project/base/src/main/kotlin/compose/ComposeMetricsHelper.kt similarity index 100% rename from gradle/plugin/project/base/src/main/kotlin/project/base/compose/ComposeMetricsHelper.kt rename to gradle/plugin/project/base/src/main/kotlin/compose/ComposeMetricsHelper.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config.igdb.gradle.kts b/gradle/plugin/project/config/src/main/kotlin/config.igdb.gradle.kts similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config.igdb.gradle.kts rename to gradle/plugin/project/config/src/main/kotlin/config.igdb.gradle.kts diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/igdb/GenerateIgdbOptionsTask.kt b/gradle/plugin/project/config/src/main/kotlin/config/igdb/GenerateIgdbOptionsTask.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/igdb/GenerateIgdbOptionsTask.kt rename to gradle/plugin/project/config/src/main/kotlin/config/igdb/GenerateIgdbOptionsTask.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/igdb/IgdbConfigReader.kt b/gradle/plugin/project/config/src/main/kotlin/config/igdb/IgdbConfigReader.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/igdb/IgdbConfigReader.kt rename to gradle/plugin/project/config/src/main/kotlin/config/igdb/IgdbConfigReader.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/igdb/IgdbOptionsGenerator.kt b/gradle/plugin/project/config/src/main/kotlin/config/igdb/IgdbOptionsGenerator.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/igdb/IgdbOptionsGenerator.kt rename to gradle/plugin/project/config/src/main/kotlin/config/igdb/IgdbOptionsGenerator.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/igdb/LocalIgdbOptions.kt b/gradle/plugin/project/config/src/main/kotlin/config/igdb/LocalIgdbOptions.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/igdb/LocalIgdbOptions.kt rename to gradle/plugin/project/config/src/main/kotlin/config/igdb/LocalIgdbOptions.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/igdb/LocalIgdbOptionsValueSource.kt b/gradle/plugin/project/config/src/main/kotlin/config/igdb/LocalIgdbOptionsValueSource.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/igdb/LocalIgdbOptionsValueSource.kt rename to gradle/plugin/project/config/src/main/kotlin/config/igdb/LocalIgdbOptionsValueSource.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/util/AndroidGradlePluginExt.kt b/gradle/plugin/project/config/src/main/kotlin/config/util/AndroidGradlePluginExt.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/util/AndroidGradlePluginExt.kt rename to gradle/plugin/project/config/src/main/kotlin/config/util/AndroidGradlePluginExt.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/util/PixnewsConfigPropertyExt.kt b/gradle/plugin/project/config/src/main/kotlin/config/util/PixnewsConfigPropertyExt.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/util/PixnewsConfigPropertyExt.kt rename to gradle/plugin/project/config/src/main/kotlin/config/util/PixnewsConfigPropertyExt.kt diff --git a/gradle/plugin/project/config/src/main/kotlin/project/config/util/StringExt.kt b/gradle/plugin/project/config/src/main/kotlin/config/util/StringExt.kt similarity index 100% rename from gradle/plugin/project/config/src/main/kotlin/project/config/util/StringExt.kt rename to gradle/plugin/project/config/src/main/kotlin/config/util/StringExt.kt diff --git a/gradle/plugin/project/config/src/test/kotlin/Dummy.kt b/gradle/plugin/project/config/src/test/kotlin/Dummy.kt new file mode 100644 index 00000000..548cb2d0 --- /dev/null +++ b/gradle/plugin/project/config/src/test/kotlin/Dummy.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2024, the Pixnews project authors and contributors. Please see the AUTHORS file for details. + * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + */ + +@file:Suppress("FILE_CONTAINS_ONLY_COMMENTS", "FILE_NO_BLANK_LINE_BETWEEN_BLOCKS") + +// Workaround for https://youtrack.jetbrains.com/issue/KTIJ-27842 +package ru.pixnews.gradle.project diff --git a/gradle/plugin/project/config/src/test/kotlin/project/config/igdb/IgdbConfigReaderTest.kt b/gradle/plugin/project/config/src/test/kotlin/config/igdb/IgdbConfigReaderTest.kt similarity index 100% rename from gradle/plugin/project/config/src/test/kotlin/project/config/igdb/IgdbConfigReaderTest.kt rename to gradle/plugin/project/config/src/test/kotlin/config/igdb/IgdbConfigReaderTest.kt diff --git a/gradle/plugin/project/config/src/test/kotlin/project/config/igdb/IgdbOptionsGeneratorTest.kt b/gradle/plugin/project/config/src/test/kotlin/config/igdb/IgdbOptionsGeneratorTest.kt similarity index 100% rename from gradle/plugin/project/config/src/test/kotlin/project/config/igdb/IgdbOptionsGeneratorTest.kt rename to gradle/plugin/project/config/src/test/kotlin/config/igdb/IgdbOptionsGeneratorTest.kt diff --git a/gradle/plugin/project/di/convention/project/di/anvil-factories.gradle.kts b/gradle/plugin/project/di/convention/anvil-factories.gradle.kts similarity index 100% rename from gradle/plugin/project/di/convention/project/di/anvil-factories.gradle.kts rename to gradle/plugin/project/di/convention/anvil-factories.gradle.kts diff --git a/gradle/plugin/project/di/convention/project/di/anvil-kapt.gradle.kts b/gradle/plugin/project/di/convention/anvil-kapt.gradle.kts similarity index 100% rename from gradle/plugin/project/di/convention/project/di/anvil-kapt.gradle.kts rename to gradle/plugin/project/di/convention/anvil-kapt.gradle.kts diff --git a/gradle/plugin/project/kotlin/convention/project/kotlin/UnpackAarClassesTransform.kt b/gradle/plugin/project/kotlin/convention/UnpackAarClassesTransform.kt similarity index 100% rename from gradle/plugin/project/kotlin/convention/project/kotlin/UnpackAarClassesTransform.kt rename to gradle/plugin/project/kotlin/convention/UnpackAarClassesTransform.kt diff --git a/gradle/plugin/project/kotlin/convention/project/kotlin/compose-compiler.gradle.kts b/gradle/plugin/project/kotlin/convention/compose-compiler.gradle.kts similarity index 100% rename from gradle/plugin/project/kotlin/convention/project/kotlin/compose-compiler.gradle.kts rename to gradle/plugin/project/kotlin/convention/compose-compiler.gradle.kts diff --git a/gradle/plugin/project/kotlin/convention/project/kotlin/library.gradle.kts b/gradle/plugin/project/kotlin/convention/library.gradle.kts similarity index 100% rename from gradle/plugin/project/kotlin/convention/project/kotlin/library.gradle.kts rename to gradle/plugin/project/kotlin/convention/library.gradle.kts diff --git a/gradle/plugin/project/lint/convention/project/lint/CommonAndroidLint.kt b/gradle/plugin/project/lint/convention/CommonAndroidLint.kt similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/CommonAndroidLint.kt rename to gradle/plugin/project/lint/convention/CommonAndroidLint.kt diff --git a/gradle/plugin/project/lint/convention/project/lint/LintConfig.kt b/gradle/plugin/project/lint/convention/LintConfig.kt similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/LintConfig.kt rename to gradle/plugin/project/lint/convention/LintConfig.kt diff --git a/gradle/plugin/project/lint/convention/project/lint/android-lint-noagp.gradle.kts b/gradle/plugin/project/lint/convention/android-lint-noagp.gradle.kts similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/android-lint-noagp.gradle.kts rename to gradle/plugin/project/lint/convention/android-lint-noagp.gradle.kts diff --git a/gradle/plugin/project/lint/convention/project/lint/android-lint.gradle.kts b/gradle/plugin/project/lint/convention/android-lint.gradle.kts similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/android-lint.gradle.kts rename to gradle/plugin/project/lint/convention/android-lint.gradle.kts diff --git a/gradle/plugin/project/lint/convention/project/lint/detekt.gradle.kts b/gradle/plugin/project/lint/convention/detekt.gradle.kts similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/detekt.gradle.kts rename to gradle/plugin/project/lint/convention/detekt.gradle.kts diff --git a/gradle/plugin/project/lint/convention/project/lint/diktat.gradle.kts b/gradle/plugin/project/lint/convention/diktat.gradle.kts similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/diktat.gradle.kts rename to gradle/plugin/project/lint/convention/diktat.gradle.kts diff --git a/gradle/plugin/project/lint/convention/project/lint/spotless.gradle.kts b/gradle/plugin/project/lint/convention/spotless.gradle.kts similarity index 100% rename from gradle/plugin/project/lint/convention/project/lint/spotless.gradle.kts rename to gradle/plugin/project/lint/convention/spotless.gradle.kts diff --git a/gradle/plugin/project/protobuf/convention/project/protobuf-wire.gradle.kts b/gradle/plugin/project/protobuf/convention/protobuf-wire.gradle.kts similarity index 100% rename from gradle/plugin/project/protobuf/convention/project/protobuf-wire.gradle.kts rename to gradle/plugin/project/protobuf/convention/protobuf-wire.gradle.kts diff --git a/gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm.gradle.kts b/gradle/plugin/project/testing-graalvm/convention/graalvm.gradle.kts similarity index 100% rename from gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm.gradle.kts rename to gradle/plugin/project/testing-graalvm/convention/graalvm.gradle.kts diff --git a/gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm/GraalvmCompilerJvmArgumentsProvider.kt b/gradle/plugin/project/testing-graalvm/convention/graalvm/GraalvmCompilerJvmArgumentsProvider.kt similarity index 100% rename from gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm/GraalvmCompilerJvmArgumentsProvider.kt rename to gradle/plugin/project/testing-graalvm/convention/graalvm/GraalvmCompilerJvmArgumentsProvider.kt diff --git a/gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm/ProviderExt.kt b/gradle/plugin/project/testing-graalvm/convention/graalvm/ProviderExt.kt similarity index 100% rename from gradle/plugin/project/testing-graalvm/convention/project/testing/graalvm/ProviderExt.kt rename to gradle/plugin/project/testing-graalvm/convention/graalvm/ProviderExt.kt diff --git a/gradle/plugin/project/testing/src/main/kotlin/project/testing/TestCommonConfiguration.kt b/gradle/plugin/project/testing/src/main/kotlin/TestCommonConfiguration.kt similarity index 100% rename from gradle/plugin/project/testing/src/main/kotlin/project/testing/TestCommonConfiguration.kt rename to gradle/plugin/project/testing/src/main/kotlin/TestCommonConfiguration.kt diff --git a/gradle/plugin/settings/convention/settings/common.settings.gradle.kts b/gradle/plugin/settings/convention/common.settings.gradle.kts similarity index 100% rename from gradle/plugin/settings/convention/settings/common.settings.gradle.kts rename to gradle/plugin/settings/convention/common.settings.gradle.kts diff --git a/gradle/plugin/settings/convention/settings/gradle-enterprise.settings.gradle.kts b/gradle/plugin/settings/convention/gradle-enterprise.settings.gradle.kts similarity index 100% rename from gradle/plugin/settings/convention/settings/gradle-enterprise.settings.gradle.kts rename to gradle/plugin/settings/convention/gradle-enterprise.settings.gradle.kts diff --git a/gradle/plugin/settings/convention/settings/repositories.settings.gradle.kts b/gradle/plugin/settings/convention/repositories.settings.gradle.kts similarity index 100% rename from gradle/plugin/settings/convention/settings/repositories.settings.gradle.kts rename to gradle/plugin/settings/convention/repositories.settings.gradle.kts diff --git a/gradle/plugin/settings/convention/settings/root.settings.gradle.kts b/gradle/plugin/settings/convention/root.settings.gradle.kts similarity index 100% rename from gradle/plugin/settings/convention/settings/root.settings.gradle.kts rename to gradle/plugin/settings/convention/root.settings.gradle.kts