Change the directory structure to match our modules (#1451)

build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import com.diffplug.gradle.spotless.JavaExtension
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost

examples/build.gradle.kts

@@ -1,26 +1,10 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 plugins {
   kotlin("jvm")
   kotlin("kapt")
 }
 
 dependencies {
-  kapt(project(":kotlin:moshi-kotlin-codegen"))
+  kapt(project(":moshi-kotlin-codegen"))
   compileOnly(libs.jsr305)
   implementation(project(":moshi"))
   implementation(project(":moshi-adapters"))

gradle.properties

@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2020 Square, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 # Memory for Dokka https://github.com/Kotlin/dokka/issues/1405
 # --add-opens for GJF https://github.com/google/google-java-format#jdk-16
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 \

gradle/libs.versions.toml

@@ -1,17 +1,3 @@
-# Copyright (C) 2021 Square, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 [versions]
 autoService = "1.0"
 gjf = "1.11.0"

kotlin/tests/extra-moshi-test-module/build.gradle.kts

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2021 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-  kotlin("jvm")
-}
-
-dependencies {
-  implementation(project(":moshi"))
-}

moshi-adapters/build.gradle.kts

@@ -3,22 +3,6 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import org.gradle.jvm.tasks.Jar
 
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 plugins {
   kotlin("jvm")
   id("com.vanniktech.maven.publish.base")

moshi-adapters/japicmp/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import me.champeau.gradle.japicmp.JapicmpTask
 
 plugins {

moshi-kotlin-codegen/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer
 import com.vanniktech.maven.publish.JavadocJar.None

moshi-kotlin-tests/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import Build_gradle.TestMode.KAPT
 import Build_gradle.TestMode.KSP
 import Build_gradle.TestMode.REFLECT
@@ -69,15 +53,15 @@ dependencies {
       // Do nothing
     }
     KAPT -> {
-      "kaptTest"(project(":kotlin:moshi-kotlin-codegen"))
+      "kaptTest"(project(":moshi-kotlin-codegen"))
     }
     KSP -> {
-      "kspTest"(project(":kotlin:moshi-kotlin-codegen"))
+      "kspTest"(project(":moshi-kotlin-codegen"))
     }
   }
   testImplementation(project(":moshi"))
-  testImplementation(project(":kotlin:moshi-kotlin"))
-  testImplementation(project(":kotlin:tests:extra-moshi-test-module"))
+  testImplementation(project(":moshi-kotlin"))
+  testImplementation(project(":moshi-kotlin-tests:extra-moshi-test-module"))
   testImplementation(kotlin("reflect"))
   testImplementation(libs.junit)
   testImplementation(libs.assertj)

moshi-kotlin-tests/codegen-only/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2021 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import Build_gradle.TestMode.KAPT
 import Build_gradle.TestMode.KSP
 import Build_gradle.TestMode.REFLECT
@@ -68,18 +52,18 @@ dependencies {
   when (testMode) {
     REFLECT -> {
       // Default to KSP in this case, this is a CI-only thing
-      "kspTest"(project(":kotlin:moshi-kotlin-codegen"))
+      "kspTest"(project(":moshi-kotlin-codegen"))
     }
     KAPT -> {
-      "kaptTest"(project(":kotlin:moshi-kotlin-codegen"))
+      "kaptTest"(project(":moshi-kotlin-codegen"))
     }
     KSP -> {
-      "kspTest"(project(":kotlin:moshi-kotlin-codegen"))
+      "kspTest"(project(":moshi-kotlin-codegen"))
     }
   }
   testImplementation(project(":moshi"))
-  testImplementation(project(":kotlin:moshi-kotlin"))
-  testImplementation(project(":kotlin:tests:extra-moshi-test-module"))
+  testImplementation(project(":moshi-kotlin"))
+  testImplementation(project(":moshi-kotlin-tests:extra-moshi-test-module"))
   testImplementation(kotlin("reflect"))
   testImplementation(libs.junit)
   testImplementation(libs.assertj)

moshi-kotlin-tests/extra-moshi-test-module/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+  kotlin("jvm")
+}
+
+dependencies {
+  implementation(project(":moshi"))
+}

moshi-kotlin/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension

moshi/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension

moshi/japicmp/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import me.champeau.gradle.japicmp.JapicmpTask
 
 plugins {

moshi/records-tests/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2021 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 plugins {
   `java-library`
 }

settings.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 pluginManagement {
   repositories {
     mavenCentral()
@@ -25,16 +9,13 @@ rootProject.name = "moshi-root"
 include(":moshi")
 include(":moshi:japicmp")
 include(":moshi:records-tests")
-include(":adapters")
-project(":adapters").name = "moshi-adapters"
-include(":adapters:japicmp")
+include(":moshi-adapters")
+include(":moshi-adapters:japicmp")
 include(":examples")
-include(":kotlin:reflect")
-project(":kotlin:reflect").name = "moshi-kotlin"
-include(":kotlin:codegen")
-project(":kotlin:codegen").name = "moshi-kotlin-codegen"
-include(":kotlin:tests")
-include(":kotlin:tests:codegen-only")
-include(":kotlin:tests:extra-moshi-test-module")
+include(":moshi-kotlin")
+include(":moshi-kotlin-codegen")
+include(":moshi-kotlin-tests")
+include(":moshi-kotlin-tests:codegen-only")
+include(":moshi-kotlin-tests:extra-moshi-test-module")
 
 enableFeaturePreview("VERSION_CATALOGS")