Change coordinates (#37)

illarionov · Apr 15, 2024 · a221b83 · a221b83
1 parent f067bf0
commit a221b83
Show file tree

Hide file tree

Showing 32 changed files with 26 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ pluginManagement {
         maven {
             url = uri("https://maven.pixnews.ru")
             mavenContent {
-                includeGroupByRegex("""ru\.pixnews\.anvil\..+""")
+                includeGroup("ru.pixnews.anvil.codegen")
             }
         }
     }
@@ -56,8 +56,8 @@ Add the required dependencies
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.activity:generator:0.3")
-    api("ru.pixnews.anvil.codegen.activity:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:activity-generator:0.3")
+    api("ru.pixnews.anvil.codegen:activity-inject:0.3")
 }
 ```
 
@@ -168,8 +168,8 @@ Add the required dependencies:
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.viewmodel:generator:0.3")
-    api("ru.pixnews.anvil.codegen.viewmodel:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:viewmodel-generator:0.3")
+    api("ru.pixnews.anvil.codegen:viewmodel-inject:0.3")
 }
 ```
 
@@ -324,8 +324,8 @@ Add the required dependencies:
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.workmanager:generator:0.3")
-    api("ru.pixnews.anvil.codegen.workmanager:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:workmanager-generator:0.3")
+    api("ru.pixnews.anvil.codegen:workmanager-inject:0.3")
 }
 ```
 
@@ -483,8 +483,8 @@ Add the required dependencies:
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.test:generator:0.3")
-    api("ru.pixnews.anvil.codegen.test:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:test-generator:0.3")
+    api("ru.pixnews.anvil.codegen:test-inject:0.3")
 }
 ```
 
@@ -592,8 +592,8 @@ Add the required dependencies:
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.experiment:generator:0.3")
-    api("ru.pixnews.anvil.codegen.experiment:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:experiment-generator:0.3")
+    api("ru.pixnews.anvil.codegen:experiment-inject:0.3")
 }
 ```
 
@@ -673,8 +673,8 @@ Add the required dependencies:
 
 ```kotlin
 dependencies {
-    anvil("ru.pixnews.anvil.codegen.initializer:generator:0.3")
-    api("ru.pixnews.anvil.codegen.initializer:inject:0.3")
+    anvil("ru.pixnews.anvil.codegen:initializer-generator:0.3")
+    api("ru.pixnews.anvil.codegen:initializer-inject:0.3")
 }
 ```
 

diff --git a/activity/generator/api/generator.api → ...vity/generator/api/activity-generator.api b/activity/generator/api/generator.api → ...vity/generator/api/activity-generator.api
diff --git a/activity/generator/build.gradle.kts b/activity/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.activity"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_activity_generator_version",
     envVariableName = "ANVIL_CODEGEN_ACTIVITY_GENERATOR_VERSION",

diff --git a/activity/inject/api/inject.api → activity/inject/api/activity-inject.api b/activity/inject/api/inject.api → activity/inject/api/activity-inject.api
diff --git a/activity/inject/build.gradle.kts b/activity/inject/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.activity"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_activity_inject_version",
     envVariableName = "ANVIL_CODEGEN_ACTIVITY_INJECT_VERSION",

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.test")
 }
 
-group = "ru.pixnews.anvil.codegen"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_common_version",
     envVariableName = "ANVIL_CODEGEN_COMMON_VERSION",

diff --git a/experiment/generator/api/generator.api → ...nt/generator/api/experiment-generator.api b/experiment/generator/api/generator.api → ...nt/generator/api/experiment-generator.api
diff --git a/experiment/generator/build.gradle.kts b/experiment/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.experiment"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_experiment_generator_version",
     envVariableName = "ANVIL_CODEGEN_EXPERIMENT_GENERATOR_VERSION",

diff --git a/experiment/inject/api/inject.api → experiment/inject/api/experiment-inject.api b/experiment/inject/api/inject.api → experiment/inject/api/experiment-inject.api
diff --git a/experiment/inject/build.gradle.kts b/experiment/inject/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.test")
 }
 
-group = "ru.pixnews.anvil.codegen.experiment"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_experiment_inject_version",
     envVariableName = "ANVIL_CODEGEN_EXPERIMENT_INJECT_VERSION",

diff --git a/fragment/generator/api/generator.api → ...ment/generator/api/fragment-generator.api b/fragment/generator/api/generator.api → ...ment/generator/api/fragment-generator.api
diff --git a/fragment/generator/build.gradle.kts b/fragment/generator/build.gradle.kts
@@ -8,5 +8,5 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.generator")
 }
 
-group = "ru.pixnews.anvil.codegen.fragment"
+group = "ru.pixnews.anvil.codegen"
 version = "0.1-WIP"
diff --git a/fragment/inject/api/inject.api → fragment/inject/api/fragment-inject.api b/fragment/inject/api/inject.api → fragment/inject/api/fragment-inject.api
diff --git a/fragment/inject/build.gradle.kts b/fragment/inject/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.binary.compatibility.validator")
 }
 
-group = "ru.pixnews.anvil.codegen.fragment"
+group = "ru.pixnews.anvil.codegen"
 version = "0.1-WIP"
 
 android {

diff --git a/...ct/kotlin/src/main/kotlin/ru.pixnews.anvil.codegen.build-logic.project.publish.gradle.kts b/...ct/kotlin/src/main/kotlin/ru.pixnews.anvil.codegen.build-logic.project.publish.gradle.kts
@@ -16,6 +16,8 @@ plugins {
     id("com.vanniktech.maven.publish.base")
 }
 
+group = "ru.pixnews.anvil.codegen"
+
 createAnvilCodegenVersionsExtension()
 
 tasks.withType<AbstractArchiveTask>().configureEach {

diff --git a/initializer/generator/api/generator.api → ...r/generator/api/initializer-generator.api b/initializer/generator/api/generator.api → ...r/generator/api/initializer-generator.api
diff --git a/initializer/generator/build.gradle.kts b/initializer/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.initializer"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_initializer_generator_version",
     envVariableName = "ANVIL_CODEGEN_INITIALIZER_GENERATOR_VERSION",

diff --git a/initializer/inject/api/inject.api → ...ializer/inject/api/initializer-inject.api b/initializer/inject/api/inject.api → ...ializer/inject/api/initializer-inject.api
diff --git a/initializer/inject/build.gradle.kts b/initializer/inject/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.test")
 }
 
-group = "ru.pixnews.anvil.codegen.initializer"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_initializer_inject_version",
     envVariableName = "ANVIL_CODEGEN_INITIALIZER_INJECT_VERSION",

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,7 +23,13 @@ listOf(
     "test",
     "viewmodel",
     "workmanager",
-).forEach {
-    include("$it:generator")
-    include("$it:inject")
+).forEach { subproject ->
+    "$subproject-generator".let {
+        include(it)
+        project(":$it").projectDir = file("$subproject/generator")
+    }
+    "$subproject-inject".let {
+        include(it)
+        project(":$it").projectDir = file("$subproject/inject")
+    }
 }
diff --git a/test/generator/api/generator.api → test/generator/api/test-generator.api b/test/generator/api/generator.api → test/generator/api/test-generator.api
diff --git a/test/generator/build.gradle.kts b/test/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.test"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_test_generator_version",
     envVariableName = "ANVIL_CODEGEN_TEST_GENERATOR_VERSION",

diff --git a/test/inject/api/inject.api → test/inject/api/test-inject.api b/test/inject/api/inject.api → test/inject/api/test-inject.api
diff --git a/test/inject/build.gradle.kts b/test/inject/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.test")
 }
 
-group = "ru.pixnews.anvil.codegen.test"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_test_inject_version",
     envVariableName = "ANVIL_CODEGEN_TEST_INJECT_VERSION",

diff --git a/viewmodel/generator/api/generator.api → ...del/generator/api/viewmodel-generator.api b/viewmodel/generator/api/generator.api → ...del/generator/api/viewmodel-generator.api
diff --git a/viewmodel/generator/build.gradle.kts b/viewmodel/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.viewmodel"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_viewmodel_generator_version",
     envVariableName = "ANVIL_CODEGEN_VIEWMODEL_GENERATOR_VERSION",

diff --git a/viewmodel/inject/api/inject.api → viewmodel/inject/api/viewmodel-inject.api b/viewmodel/inject/api/inject.api → viewmodel/inject/api/viewmodel-inject.api
diff --git a/viewmodel/inject/build.gradle.kts b/viewmodel/inject/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.viewmodel"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_viewmodel_inject_version",
     envVariableName = "ANVIL_CODEGEN_VIEWMODEL_INJECT_VERSION",

diff --git a/workmanager/generator/api/generator.api → ...r/generator/api/workmanager-generator.api b/workmanager/generator/api/generator.api → ...r/generator/api/workmanager-generator.api
diff --git a/workmanager/generator/build.gradle.kts b/workmanager/generator/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.workmanager"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_workmanager_generator_version",
     envVariableName = "ANVIL_CODEGEN_WORKMANAGER_GENERATOR_VERSION",

diff --git a/workmanager/inject/api/inject.api → ...manager/inject/api/workmanager-inject.api b/workmanager/inject/api/inject.api → ...manager/inject/api/workmanager-inject.api
diff --git a/workmanager/inject/build.gradle.kts b/workmanager/inject/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     id("ru.pixnews.anvil.codegen.build-logic.project.publish")
 }
 
-group = "ru.pixnews.anvil.codegen.workmanager"
 version = anvilCodegenVersions.getSubmoduleVersionProvider(
     propertiesFileKey = "anvil_codegen_workmanager_generator_version",
     envVariableName = "ANVIL_CODEGEN_WORKMANAGER_GENERATOR_VERSION",