Move all third-party support into a separate directory

ansman · Apr 12, 2024 · 3f39b57 · 3f39b57
1 parent d4160bc
commit 3f39b57
Show file tree

Hide file tree

Showing 61 changed files with 34 additions and 24 deletions.
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 
 dependencies {
     implementation(projects.core)
-    implementation(projects.retrofit)
-    implementation(projects.androidx.room)
-    implementation(projects.android.testing)
+    implementation(projects.thirdParty.retrofit)
+    implementation(projects.thirdParty.androidx.room)
+    implementation(projects.thirdParty.android.testing)
     testFixturesApi(projects.compiler.common.testUtils)
 }
diff --git a/gradle-plugin/src/main/kotlin/library.gradle.kts b/gradle-plugin/src/main/kotlin/library.gradle.kts
@@ -77,7 +77,9 @@ pluginManager.withPlugin("com.android.base") {
             minSdk = libs.versions.android.minSdk.get().toInt()
             testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
-        namespace = (rootProject.group as String) + project.path.replace(':', '.')
+        namespace = (rootProject.group as String) + project.path
+            .removePrefix(":third-party")
+            .replace(':', '.')
         buildFeatures {
             buildConfig = false
             resValues = false

diff --git a/gradle-plugin/src/main/kotlin/library.publishing.gradle.kts b/gradle-plugin/src/main/kotlin/library.publishing.gradle.kts
@@ -1,5 +1,6 @@
 
 import com.android.build.gradle.LibraryExtension
+import com.android.build.gradle.internal.scope.ProjectInfo.Companion.getBaseName
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
@@ -18,7 +19,10 @@ plugins {
 
 val libs = the<LibrariesForLibs>()
 
-archivesName.set(project.path.removePrefix(":").replace(':', '-'))
+archivesName.set(project.path
+    .removePrefix(":third-party")
+    .removePrefix(":")
+    .replace(':', '-'))
 
 val gitCommit = cachedProvider {
     project.execWithOutput {
@@ -107,15 +111,19 @@ val sourcesJar by tasks.registering(Jar::class) {
 
 val publication = publishing.publications.register<MavenPublication>("autoDagger") {
     groupId = rootProject.group as String
-    artifactId = project.path.removePrefix(":").replace(':', '-')
+    artifactId = project.path
+        .removePrefix(":third-party")
+        .removePrefix(":")
+        .replace(':', '-')
     version = providers.gradleProperty("version").get()
     artifact(sourcesJar)
     artifact(javadocJar)
     pom {
         val moduleName = project.path
+            .removePrefix(":third-party")
             .removePrefix(":")
             .splitToSequence(":")
-            .joinToString { it.replaceFirstChar(Char::uppercaseChar) }
+            .joinToString(" ") { it.replaceFirstChar(Char::uppercaseChar) }
 
         name.set("Auto Dagger $moduleName")
         description.set("Automatic Dagger setup using Hilt")
@@ -205,12 +213,12 @@ afterEvaluate {
             dependsOn("classes")
             from(project.extensions.getByType<SourceSetContainer>().getByName("main").allSource)
         }
-        if (pluginManager.hasPlugin("java-test-fixture")) {
-            // Disables publishing test fixtures:
-            // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants
-            val javaComponent = components["java"] as AdhocComponentWithVariants
-            javaComponent.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
-            javaComponent.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
-        }
     }
 }
+pluginManager.withPlugin("org.gradle.java-test-fixtures") {
+    // Disables publishing test fixtures:
+    // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants
+    val javaComponent = components["java"] as AdhocComponentWithVariants
+    javaComponent.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
+    javaComponent.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -25,12 +25,12 @@ includeBuild("gradle-plugin")
 rootProject.name = "auto-dagger"
 
 include(":core")
-include(":android")
-include(":android:testing")
 include(":compiler")
 include(":compiler:common")
 include(":compiler:common:test-utils")
-include(":retrofit")
-include(":androidx:viewmodel")
-include(":androidx:room")
+include(":third-party:android")
+include(":third-party:android:testing")
+include(":third-party:retrofit")
+include(":third-party:androidx:viewmodel")
+include(":third-party:androidx:room")
 include(":tests")
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -40,12 +40,7 @@ androidComponents {
 }
 
 dependencies {
-    implementation(projects.android)
-    implementation(projects.androidx.viewmodel)
-    implementation(projects.androidx.room)
-    implementation(projects.retrofit)
     implementation(libs.retrofit.moshi)
-    implementation(projects.android.testing)
     implementation(libs.dagger.hilt.android)
     "kaptJava"(projects.compiler)
     "kspKotlin"(projects.compiler)
@@ -55,6 +50,11 @@ dependencies {
     "kspKotlin"(libs.dagger.hilt.compiler)
 
     // Third party
+    implementation(projects.thirdParty.android.testing)
+    implementation(projects.thirdParty.android)
+    implementation(projects.thirdParty.androidx.viewmodel)
+    implementation(projects.thirdParty.androidx.room)
+    implementation(projects.thirdParty.retrofit)
     implementation(libs.retrofit)
     implementation(libs.androidx.lifecycle.viewmodel)
     implementation(libs.room)

diff --git a/android/api/android.api → third-party/android/api/android.api b/android/api/android.api → third-party/android/api/android.api
diff --git a/android/build.gradle.kts → third-party/android/build.gradle.kts b/android/build.gradle.kts → third-party/android/build.gradle.kts
diff --git a/android/src/main/AndroidManifest.xml → ...arty/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml → ...arty/android/src/main/AndroidManifest.xml
diff --git a/...ndroid/AutoDaggerInitializerEntryPoint.kt → ...ndroid/AutoDaggerInitializerEntryPoint.kt b/...ndroid/AutoDaggerInitializerEntryPoint.kt → ...ndroid/AutoDaggerInitializerEntryPoint.kt
diff --git a/...o/android/AutoDaggerStartupInitializer.kt → ...o/android/AutoDaggerStartupInitializer.kt b/...o/android/AutoDaggerStartupInitializer.kt → ...o/android/AutoDaggerStartupInitializer.kt
diff --git a/android/testing/api/testing.api → third-party/android/testing/api/testing.api b/android/testing/api/testing.api → third-party/android/testing/api/testing.api
diff --git a/android/testing/build.gradle.kts → third-party/android/testing/build.gradle.kts b/android/testing/build.gradle.kts → third-party/android/testing/build.gradle.kts
diff --git a/...n/dagger/auto/android/testing/Replaces.kt → ...n/dagger/auto/android/testing/Replaces.kt b/...n/dagger/auto/android/testing/Replaces.kt → ...n/dagger/auto/android/testing/Replaces.kt
diff --git a/androidx/room/api/room.api → third-party/androidx/room/api/room.api b/androidx/room/api/room.api → third-party/androidx/room/api/room.api
diff --git a/androidx/room/build.gradle.kts → third-party/androidx/room/build.gradle.kts b/androidx/room/build.gradle.kts → third-party/androidx/room/build.gradle.kts
diff --git a/...ger/auto/androidx/room/AutoProvideDaos.kt → ...ger/auto/androidx/room/AutoProvideDaos.kt b/...ger/auto/androidx/room/AutoProvideDaos.kt → ...ger/auto/androidx/room/AutoProvideDaos.kt
diff --git a/...est/kotlin/androidx/room/AutoMigration.kt → ...est/kotlin/androidx/room/AutoMigration.kt b/...est/kotlin/androidx/room/AutoMigration.kt → ...est/kotlin/androidx/room/AutoMigration.kt
diff --git a/...src/test/kotlin/androidx/room/Database.kt → ...src/test/kotlin/androidx/room/Database.kt b/...src/test/kotlin/androidx/room/Database.kt → ...src/test/kotlin/androidx/room/Database.kt
diff --git a/...test/kotlin/androidx/room/RoomDatabase.kt → ...test/kotlin/androidx/room/RoomDatabase.kt b/...test/kotlin/androidx/room/RoomDatabase.kt → ...test/kotlin/androidx/room/RoomDatabase.kt
diff --git a/...ndroidx/room/AndroidXRoomResourceTests.kt → ...ndroidx/room/AndroidXRoomResourceTests.kt b/...ndroidx/room/AndroidXRoomResourceTests.kt → ...ndroidx/room/AndroidXRoomResourceTests.kt
diff --git a/...er/auto/androidx/room/AndroidXRoomTest.kt → ...er/auto/androidx/room/AndroidXRoomTest.kt b/...er/auto/androidx/room/AndroidXRoomTest.kt → ...er/auto/androidx/room/AndroidXRoomTest.kt
diff --git a/...x_room/duplicate_accessors/AppDatabase.kt → ...x_room/duplicate_accessors/AppDatabase.kt b/...x_room/duplicate_accessors/AppDatabase.kt → ...x_room/duplicate_accessors/AppDatabase.kt
diff --git a/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt b/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt
diff --git a/...rs/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...rs/ksp/AutoDaggerAppDatabaseModule.kt.txt b/...rs/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...rs/ksp/AutoDaggerAppDatabaseModule.kt.txt
diff --git a/...ts/androidx_room/functions/AppDatabase.kt → ...ts/androidx_room/functions/AppDatabase.kt b/...ts/androidx_room/functions/AppDatabase.kt → ...ts/androidx_room/functions/AppDatabase.kt
diff --git a/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt b/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt
diff --git a/...ns/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...ns/ksp/AutoDaggerAppDatabaseModule.kt.txt b/...ns/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...ns/ksp/AutoDaggerAppDatabaseModule.kt.txt
diff --git a/...s/androidx_room/properties/AppDatabase.kt → ...s/androidx_room/properties/AppDatabase.kt b/...s/androidx_room/properties/AppDatabase.kt → ...s/androidx_room/properties/AppDatabase.kt
diff --git a/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt b/...kapt/AutoDaggerAppDatabaseModule.java.txt → ...kapt/AutoDaggerAppDatabaseModule.java.txt
diff --git a/...es/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...es/ksp/AutoDaggerAppDatabaseModule.kt.txt b/...es/ksp/AutoDaggerAppDatabaseModule.kt.txt → ...es/ksp/AutoDaggerAppDatabaseModule.kt.txt
diff --git a/androidx/viewmodel/api/viewmodel.api → ...arty/androidx/viewmodel/api/viewmodel.api b/androidx/viewmodel/api/viewmodel.api → ...arty/androidx/viewmodel/api/viewmodel.api
diff --git a/androidx/viewmodel/build.gradle.kts → ...party/androidx/viewmodel/build.gradle.kts b/androidx/viewmodel/build.gradle.kts → ...party/androidx/viewmodel/build.gradle.kts
diff --git a/...DaggerViewModelCoroutineScopeComponent.kt → ...DaggerViewModelCoroutineScopeComponent.kt b/...DaggerViewModelCoroutineScopeComponent.kt → ...DaggerViewModelCoroutineScopeComponent.kt
diff --git a/...o/androidx/viewmodel/ViewModelSpecific.kt → ...o/androidx/viewmodel/ViewModelSpecific.kt b/...o/androidx/viewmodel/ViewModelSpecific.kt → ...o/androidx/viewmodel/ViewModelSpecific.kt
diff --git a/...erViewModelCoroutineScopeComponentTest.kt → ...erViewModelCoroutineScopeComponentTest.kt b/...erViewModelCoroutineScopeComponentTest.kt → ...erViewModelCoroutineScopeComponentTest.kt
diff --git a/retrofit/api/retrofit.api → third-party/retrofit/api/retrofit.api b/retrofit/api/retrofit.api → third-party/retrofit/api/retrofit.api
diff --git a/retrofit/build.gradle.kts → third-party/retrofit/build.gradle.kts b/retrofit/build.gradle.kts → third-party/retrofit/build.gradle.kts
diff --git a/...agger/auto/retrofit/AutoProvideService.kt → ...agger/auto/retrofit/AutoProvideService.kt b/...agger/auto/retrofit/AutoProvideService.kt → ...agger/auto/retrofit/AutoProvideService.kt
diff --git a/...er/auto/retrofit/RetrofitResourceTests.kt → ...er/auto/retrofit/RetrofitResourceTests.kt b/...er/auto/retrofit/RetrofitResourceTests.kt → ...er/auto/retrofit/RetrofitResourceTests.kt
diff --git a/...sman/dagger/auto/retrofit/RetrofitTest.kt → ...sman/dagger/auto/retrofit/RetrofitTest.kt b/...sman/dagger/auto/retrofit/RetrofitTest.kt → ...sman/dagger/auto/retrofit/RetrofitTest.kt
diff --git a/...s/retrofit/custom_component/ApiService.kt → ...s/retrofit/custom_component/ApiService.kt b/...s/retrofit/custom_component/ApiService.kt → ...s/retrofit/custom_component/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...ent/ksp/AutoBindRetrofitApiService.kt.txt → ...ent/ksp/AutoBindRetrofitApiService.kt.txt b/...ent/ksp/AutoBindRetrofitApiService.kt.txt → ...ent/ksp/AutoBindRetrofitApiService.kt.txt
diff --git a/...s/tests/retrofit/non_public/ApiService.kt → ...s/tests/retrofit/non_public/ApiService.kt b/...s/tests/retrofit/non_public/ApiService.kt → ...s/tests/retrofit/non_public/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...lic/ksp/AutoBindRetrofitApiService.kt.txt → ...lic/ksp/AutoBindRetrofitApiService.kt.txt b/...lic/ksp/AutoBindRetrofitApiService.kt.txt → ...lic/ksp/AutoBindRetrofitApiService.kt.txt
diff --git a/.../retrofit/non_public_parent/ApiService.kt → .../retrofit/non_public_parent/ApiService.kt b/.../retrofit/non_public_parent/ApiService.kt → .../retrofit/non_public_parent/ApiService.kt
diff --git a/...trofitWrapper1Wrapper2ApiService.java.txt → ...trofitWrapper1Wrapper2ApiService.java.txt b/...trofitWrapper1Wrapper2ApiService.java.txt → ...trofitWrapper1Wrapper2ApiService.java.txt
diff --git a/...RetrofitWrapper1Wrapper2ApiService.kt.txt → ...RetrofitWrapper1Wrapper2ApiService.kt.txt b/...RetrofitWrapper1Wrapper2ApiService.kt.txt → ...RetrofitWrapper1Wrapper2ApiService.kt.txt
diff --git a/...s/tests/retrofit/qualifiers/ApiService.kt → ...s/tests/retrofit/qualifiers/ApiService.kt b/...s/tests/retrofit/qualifiers/ApiService.kt → ...s/tests/retrofit/qualifiers/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...ers/ksp/AutoBindRetrofitApiService.kt.txt → ...ers/ksp/AutoBindRetrofitApiService.kt.txt b/...ers/ksp/AutoBindRetrofitApiService.kt.txt → ...ers/ksp/AutoBindRetrofitApiService.kt.txt
diff --git a/...ces/tests/retrofit/reusable/ApiService.kt → ...ces/tests/retrofit/reusable/ApiService.kt b/...ces/tests/retrofit/reusable/ApiService.kt → ...ces/tests/retrofit/reusable/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...ble/ksp/AutoBindRetrofitApiService.kt.txt → ...ble/ksp/AutoBindRetrofitApiService.kt.txt b/...ble/ksp/AutoBindRetrofitApiService.kt.txt → ...ble/ksp/AutoBindRetrofitApiService.kt.txt
diff --git a/...urces/tests/retrofit/scoped/ApiService.kt → ...urces/tests/retrofit/scoped/ApiService.kt b/...urces/tests/retrofit/scoped/ApiService.kt → ...urces/tests/retrofit/scoped/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...ped/ksp/AutoBindRetrofitApiService.kt.txt → ...ped/ksp/AutoBindRetrofitApiService.kt.txt b/...ped/ksp/AutoBindRetrofitApiService.kt.txt → ...ped/ksp/AutoBindRetrofitApiService.kt.txt
diff --git a/...urces/tests/retrofit/simple/ApiService.kt → ...urces/tests/retrofit/simple/ApiService.kt b/...urces/tests/retrofit/simple/ApiService.kt → ...urces/tests/retrofit/simple/ApiService.kt
diff --git a/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt b/.../kapt/AutoBindRetrofitApiService.java.txt → .../kapt/AutoBindRetrofitApiService.java.txt
diff --git a/...ple/ksp/AutoBindRetrofitApiService.kt.txt → ...ple/ksp/AutoBindRetrofitApiService.kt.txt b/...ple/ksp/AutoBindRetrofitApiService.kt.txt → ...ple/ksp/AutoBindRetrofitApiService.kt.txt