Skip to content

Commit b57ab9b

Browse files
committed
unify tests/samples structure
This commit follows the naming pattern we use for the compiler/compiler-ast module nesting. Note that these tests/samples modules are not published so these namings are purely for consistency reason and ease of identification.
1 parent e3edd84 commit b57ab9b

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

Diff for: build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,11 @@ subprojects {
106106
}
107107

108108
apply plugin: 'org.jetbrains.dokka'
109-
tasks.withType(DokkaTaskPartial).configureEach {
110-
outputDirectory.set(new File(buildDir, "docs/partial"))
111-
moduleName.set(project.property("POM_ARTIFACT_ID").toString())
112-
moduleVersion.set(project.property("VERSION_NAME").toString())
109+
if (!project.name.contains("samples") && !project.name.contains("tests")) {
110+
tasks.withType(DokkaTaskPartial).configureEach {
111+
outputDirectory.set(new File(buildDir, "docs/partial"))
112+
moduleName.set(project.property("POM_ARTIFACT_ID").toString())
113+
moduleVersion.set(project.property("VERSION_NAME").toString())
114+
}
113115
}
114116
}

Diff for: samples/sample/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
annotationProcessor deps.butterknifeCompiler
3939
annotationProcessor deps.glideCompiler
4040
annotationProcessor project(':compiler')
41-
implementation project(':samples:sample-lib')
41+
implementation project(':samples-sample-lib')
4242
implementation project(':lib')
4343
implementation deps.glide
4444
implementation deps.stetho
@@ -47,5 +47,4 @@ dependencies {
4747

4848
testImplementation deps.test.junit
4949
testImplementation deps.test.truth
50-
5150
}

Diff for: settings.gradle

+18-11
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,35 @@ pluginManagement {
2929
}
3030

3131
rootProject.name = 'motif'
32-
include 'lib'
32+
include 'ast'
3333
include 'compiler'
3434
include 'compiler-ast'
3535
include 'compiler-ksp'
36-
include 'samples:sample'
37-
include 'samples:sample-lib'
38-
include 'samples:sample-kotlin'
39-
include 'samples:sample-kotlin-ksp'
40-
include 'samples:dagger-comparison'
41-
include 'intellij'
42-
include 'intellij-ast'
4336
include 'core'
4437
include 'errormessage'
38+
include 'intellij'
39+
include 'intellij-ast'
40+
include 'lib'
4541
include 'models'
46-
include 'ast'
42+
include 'samples-dagger-comparison'
43+
include 'samples-sample'
44+
include 'samples-sample-kotlin'
45+
include 'samples-sample-kotlin-ksp'
46+
include 'samples-sample-lib'
47+
include 'samples-sample-lib-ksp'
4748
include 'tests'
48-
include 'tests:compiler'
49+
include 'tests-compiler'
4950
include 'viewmodel'
5051
include 'xprocessing'
5152
include 'xprocessing-testing'
5253

5354
project(':compiler-ast').projectDir = file('compiler/ast')
5455
project(':compiler-ksp').projectDir = file('compiler/ksp')
5556
project(':intellij-ast').projectDir = file('intellij/ast')
56-
include ':samples:sample-lib-ksp'
57+
project(':samples-dagger-comparison').projectDir = file('samples/dagger-comparison')
58+
project(':samples-sample').projectDir = file('samples/sample')
59+
project(':samples-sample-kotlin').projectDir = file('samples/sample-kotlin')
60+
project(':samples-sample-kotlin-ksp').projectDir = file('samples/sample-kotlin-ksp')
61+
project(':samples-sample-lib').projectDir = file('samples/sample-lib')
62+
project(':samples-sample-lib-ksp').projectDir = file('samples/sample-lib-ksp')
63+
project(':tests-compiler').projectDir = file('tests/compiler')

Diff for: tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ kotlin {
1717
}
1818

1919
dependencies {
20-
kapt project(':tests:compiler')
20+
kapt project(':tests-compiler')
2121
kapt deps.daggerCompiler
2222
implementation project(':core')
2323
implementation project(':lib')

0 commit comments

Comments
 (0)