diff --git a/.winds/resources/bom/1.0.0-alpha01/dependencies-1.0.0-alpha01.json b/.winds/resources/bom/1.0.0-alpha01/dependencies-1.0.0-alpha01.json deleted file mode 100644 index 05d1cdf..0000000 --- a/.winds/resources/bom/1.0.0-alpha01/dependencies-1.0.0-alpha01.json +++ /dev/null @@ -1,116 +0,0 @@ -[ - { - "completeName": "Drifter Compose", - "name": "compose", - "displayName": "Compose", - "description": "🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly.", - "groupId": "dev.teogor.drifter", - "artifactId": "compose", - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "path": ":drifter-compose", - "dependencies": [ - ], - "canBePublished": true, - "names": [ - "Drifter", - "Compose" - ] - }, - { - "completeName": "Drifter Core", - "name": "core", - "displayName": "Core", - "description": "🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly.", - "groupId": "dev.teogor.drifter", - "artifactId": "core", - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "path": ":drifter-core", - "dependencies": [ - ], - "canBePublished": true, - "names": [ - "Drifter", - "Core" - ] - }, - { - "completeName": "Drifter Integration", - "name": "integration", - "displayName": "Integration", - "description": "🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly.", - "groupId": "dev.teogor.drifter", - "artifactId": "integration", - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "path": ":drifter-integration", - "dependencies": [ - ], - "canBePublished": true, - "names": [ - "Drifter", - "Integration" - ] - }, - { - "completeName": "Drifter", - "name": "drifter", - "displayName": "Drifter", - "description": "🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly.", - "groupId": "dev.teogor.drifter", - "artifactId": "drifter", - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "path": ":drifter-plugin", - "dependencies": [ - ], - "canBePublished": true, - "names": [ - "Drifter" - ] - }, - { - "completeName": "Drifter Wallpaper", - "name": "wallpaper", - "displayName": "Wallpaper", - "description": "🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly.", - "groupId": "dev.teogor.drifter", - "artifactId": "wallpaper", - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "path": ":drifter-wallpaper", - "dependencies": [ - ], - "canBePublished": true, - "names": [ - "Drifter", - "Wallpaper" - ] - } -] \ No newline at end of file diff --git a/.winds/resources/bom/versions.json b/.winds/resources/bom/versions.json deleted file mode 100644 index 3faaf7f..0000000 --- a/.winds/resources/bom/versions.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "version": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "date": 1695743970, - "bomVersion": { - "major": 1, - "minor": 0, - "patch": 0, - "flag": "Alpha", - "versionQualifier": 1 - }, - "bomDate": 1695743970 - } -] diff --git a/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt b/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt deleted file mode 100644 index af290cb..0000000 --- a/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt +++ /dev/null @@ -1,6 +0,0 @@ -package dev.teogor.drifter.common - -object StatusBarHeightPlugin { - val statusBarHeight: Int - get() { return 200 } -} diff --git a/drifter-bom/build.gradle.kts b/bom/build.gradle.kts similarity index 90% rename from drifter-bom/build.gradle.kts rename to bom/build.gradle.kts index d1849d5..c2ccf35 100644 --- a/drifter-bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -14,7 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost import dev.teogor.winds.api.ArtifactIdFormat import dev.teogor.winds.ktx.createVersion @@ -22,7 +21,6 @@ plugins { alias(libs.plugins.teogor.winds) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { isBom = true diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts index 61d3548..e4400ae 100644 --- a/codegen/build.gradle.kts +++ b/codegen/build.gradle.kts @@ -13,8 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import com.vanniktech.maven.publish.SonatypeHost +/* + * Copyright 2024 teogor (Teodor Grigor) + * + * 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 { id("java-library") @@ -28,8 +43,8 @@ java { } tasks.withType().configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget = JvmTarget.JVM_11 } } @@ -40,7 +55,6 @@ dependencies { api(libs.kotlin.poet.ksp) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/app/.gitignore b/compiler/.gitignore similarity index 100% rename from app/.gitignore rename to compiler/.gitignore diff --git a/ksp/api/ksp.api b/compiler/api/compiler.api similarity index 100% rename from ksp/api/ksp.api rename to compiler/api/compiler.api diff --git a/ksp/build.gradle.kts b/compiler/build.gradle.kts similarity index 81% rename from ksp/build.gradle.kts rename to compiler/build.gradle.kts index 5a5d61f..492b4ac 100644 --- a/ksp/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.kotlin.jvm) @@ -27,10 +27,9 @@ java { } tasks.withType().configureEach { - kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") + jvmTarget = JvmTarget.JVM_11 } } @@ -41,11 +40,14 @@ dependencies { implementation(libs.ksp.api) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { name = "KSP" } } + + documentationBuilder { + isCompiler = true + } } diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/ProcessorProvider.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/ProcessorProvider.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/ProcessorProvider.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/ProcessorProvider.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspCodeOutputStreamMaker.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspCodeOutputStreamMaker.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspCodeOutputStreamMaker.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspCodeOutputStreamMaker.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspLogger.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspLogger.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspLogger.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/codegen/KspLogger.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/commons/KSFileSourceMapper.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/commons/KSFileSourceMapper.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/commons/KSFileSourceMapper.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/commons/KSFileSourceMapper.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/ConfigParser.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/ConfigParser.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/ConfigParser.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/ConfigParser.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/KspToCodeGenDestinationsMapper.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/KspToCodeGenDestinationsMapper.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/KspToCodeGenDestinationsMapper.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/KspToCodeGenDestinationsMapper.kt diff --git a/ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/Processor.kt b/compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/Processor.kt similarity index 100% rename from ksp/src/main/kotlin/dev/teogor/drifter/ksp/processors/Processor.kt rename to compiler/src/main/kotlin/dev/teogor/drifter/ksp/processors/Processor.kt diff --git a/ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider similarity index 100% rename from ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider rename to compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider diff --git a/drifter-common/.gitignore b/compose/.gitignore similarity index 100% rename from drifter-common/.gitignore rename to compose/.gitignore diff --git a/drifter-compose/api/drifter-compose.api b/compose/api/compose.api similarity index 100% rename from drifter-compose/api/drifter-compose.api rename to compose/api/compose.api diff --git a/drifter-compose/build.gradle.kts b/compose/build.gradle.kts similarity index 89% rename from drifter-compose/build.gradle.kts rename to compose/build.gradle.kts index 98d188e..5ecd98f 100644 --- a/drifter-compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -14,11 +14,10 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.ceres.android.library.compose) + alias(libs.plugins.jetbrains.compose.compiler) alias(libs.plugins.teogor.winds) } @@ -47,8 +46,8 @@ dependencies { api(libs.ceres.core.common) implementation(projects.unity.common) - implementation(projects.drifterIntegration) - implementation(projects.drifterWallpaper) + implementation(projects.integration) + implementation(projects.wallpaper) implementation(platform(libs.compose.bom)) implementation(libs.ui) @@ -59,7 +58,6 @@ dependencies { implementation(libs.lifecycle.runtime.ktx) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/drifter-compose/consumer-rules.pro b/compose/consumer-rules.pro similarity index 100% rename from drifter-compose/consumer-rules.pro rename to compose/consumer-rules.pro diff --git a/app/proguard-rules.pro b/compose/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to compose/proguard-rules.pro diff --git a/drifter-compose/src/main/AndroidManifest.xml b/compose/src/main/AndroidManifest.xml similarity index 100% rename from drifter-compose/src/main/AndroidManifest.xml rename to compose/src/main/AndroidManifest.xml diff --git a/drifter-compose/src/main/kotlin/dev/teogor/drifter/compose/UnityEngineView.kt b/compose/src/main/kotlin/dev/teogor/drifter/compose/UnityEngineView.kt similarity index 100% rename from drifter-compose/src/main/kotlin/dev/teogor/drifter/compose/UnityEngineView.kt rename to compose/src/main/kotlin/dev/teogor/drifter/compose/UnityEngineView.kt diff --git a/drifter-compose/src/main/kotlin/dev/teogor/drifter/compose/components/UnityPlayerView.kt b/compose/src/main/kotlin/dev/teogor/drifter/compose/components/UnityPlayerView.kt similarity index 100% rename from drifter-compose/src/main/kotlin/dev/teogor/drifter/compose/components/UnityPlayerView.kt rename to compose/src/main/kotlin/dev/teogor/drifter/compose/components/UnityPlayerView.kt diff --git a/drifter-compose/.gitignore b/core/.gitignore similarity index 100% rename from drifter-compose/.gitignore rename to core/.gitignore diff --git a/core/api/core.api b/core/api/core.api new file mode 100644 index 0000000..cd5ad82 --- /dev/null +++ b/core/api/core.api @@ -0,0 +1,20 @@ +public final class dev/teogor/drifter/core/Serializable { + public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V +} + +public class dev/teogor/drifter/core/UnityMessageSender { + public fun (Ljava/lang/String;)V + public final fun sendMessage (Ljava/lang/String;Lorg/json/JSONObject;)V +} + +public class dev/teogor/drifter/core/UnityPlayerPrefs { + public fun ()V + protected fun get (Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/core/Serializable;)Ljava/lang/Object; + public static synthetic fun get$default (Ldev/teogor/drifter/core/UnityPlayerPrefs;Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/core/Serializable;ILjava/lang/Object;)Ljava/lang/Object; + protected fun set (Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/core/Serializable;)Ljava/lang/Object; + public static synthetic fun set$default (Ldev/teogor/drifter/core/UnityPlayerPrefs;Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/core/Serializable;ILjava/lang/Object;)Ljava/lang/Object; +} + +public abstract interface annotation class dev/teogor/drifter/core/UnityPrefAccess : java/lang/annotation/Annotation { +} + diff --git a/drifter-common/build.gradle.kts b/core/build.gradle.kts similarity index 79% rename from drifter-common/build.gradle.kts rename to core/build.gradle.kts index 42279f3..620503d 100644 --- a/drifter-common/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,27 +14,24 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.teogor.winds) } android { - namespace = "dev.teogor.drifter.common" + namespace = "dev.teogor.drifter.core" } dependencies { + implementation(projects.integration) implementation(projects.unity.common) - implementation(projects.drifterIntegration) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { - name = "Common" + name = "Core" } } } diff --git a/drifter-common/proguard-unity.txt b/core/proguard-unity.txt similarity index 100% rename from drifter-common/proguard-unity.txt rename to core/proguard-unity.txt diff --git a/drifter-common/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml similarity index 100% rename from drifter-common/src/main/AndroidManifest.xml rename to core/src/main/AndroidManifest.xml diff --git a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/Serializable.kt b/core/src/main/kotlin/dev/teogor/drifter/core/Serializable.kt similarity index 98% rename from drifter-common/src/main/kotlin/dev/teogor/drifter/common/Serializable.kt rename to core/src/main/kotlin/dev/teogor/drifter/core/Serializable.kt index 10948f6..7b9217c 100644 --- a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/Serializable.kt +++ b/core/src/main/kotlin/dev/teogor/drifter/core/Serializable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.teogor.drifter.common +package dev.teogor.drifter.core /** * A class that encapsulates serialization and deserialization logic for a specific type. diff --git a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityMessageSender.kt b/core/src/main/kotlin/dev/teogor/drifter/core/UnityMessageSender.kt similarity index 97% rename from drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityMessageSender.kt rename to core/src/main/kotlin/dev/teogor/drifter/core/UnityMessageSender.kt index b0b0df6..edf32c4 100644 --- a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityMessageSender.kt +++ b/core/src/main/kotlin/dev/teogor/drifter/core/UnityMessageSender.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.teogor.drifter.common +package dev.teogor.drifter.core import dev.teogor.drifter.unity.common.UnityEngine import org.json.JSONObject diff --git a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPlayerPrefs.kt b/core/src/main/kotlin/dev/teogor/drifter/core/UnityPlayerPrefs.kt similarity index 98% rename from drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPlayerPrefs.kt rename to core/src/main/kotlin/dev/teogor/drifter/core/UnityPlayerPrefs.kt index b1c3aa9..19d4bac 100644 --- a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPlayerPrefs.kt +++ b/core/src/main/kotlin/dev/teogor/drifter/core/UnityPlayerPrefs.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.teogor.drifter.common +package dev.teogor.drifter.core import dev.teogor.drifter.integration.core.PlayerPrefs diff --git a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPrefAccess.kt b/core/src/main/kotlin/dev/teogor/drifter/core/UnityPrefAccess.kt similarity index 96% rename from drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPrefAccess.kt rename to core/src/main/kotlin/dev/teogor/drifter/core/UnityPrefAccess.kt index 4767810..171cb07 100644 --- a/drifter-common/src/main/kotlin/dev/teogor/drifter/common/UnityPrefAccess.kt +++ b/core/src/main/kotlin/dev/teogor/drifter/core/UnityPrefAccess.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.teogor.drifter.common +package dev.teogor.drifter.core @RequiresOptIn( message = "This function interacts directly with Unity PlayerPrefs. Incorrect usage can lead to data corruption or security vulnerabilities.", diff --git a/drifter-integration/.gitignore b/demo/app/.gitignore similarity index 100% rename from drifter-integration/.gitignore rename to demo/app/.gitignore diff --git a/app/build.gradle.kts b/demo/app/build.gradle.kts similarity index 89% rename from app/build.gradle.kts rename to demo/app/build.gradle.kts index 4d3bfd7..cd3b45f 100644 --- a/app/build.gradle.kts +++ b/demo/app/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.ceres.android.application) alias(libs.plugins.ceres.android.application.compose) + alias(libs.plugins.jetbrains.compose.compiler) alias(libs.plugins.ksp) } @@ -52,16 +53,16 @@ android { } dependencies { - implementation(projects.moduleUnity) + implementation(projects.demo.moduleUnity) implementation(projects.runtime) - ksp(projects.ksp) + ksp(projects.compiler) - implementation(projects.drifterCommon) - implementation(projects.drifterCompose) + implementation(projects.compose) + implementation(projects.core) implementation(projects.unity.v202237f1) - implementation(projects.drifterIntegration) - implementation(projects.drifterWallpaper) + implementation(projects.integration) + implementation(projects.wallpaper) implementation(platform(libs.ceres.bom)) implementation(libs.ceres.core.register) diff --git a/drifter-compose/proguard-rules.pro b/demo/app/proguard-rules.pro similarity index 100% rename from drifter-compose/proguard-rules.pro rename to demo/app/proguard-rules.pro diff --git a/app/src/main/AndroidManifest.xml b/demo/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to demo/app/src/main/AndroidManifest.xml diff --git a/app/src/main/ic_launcher-playstore.png b/demo/app/src/main/ic_launcher-playstore.png similarity index 100% rename from app/src/main/ic_launcher-playstore.png rename to demo/app/src/main/ic_launcher-playstore.png diff --git a/demo/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt new file mode 100644 index 0000000..cdcb7ef --- /dev/null +++ b/demo/app/src/main/kotlin/dev/teogor/drifter/common/StatusBarHeightPlugin.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2023 teogor (Teodor Grigor) + * + * 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. + */ + +package dev.teogor.drifter.common + +object StatusBarHeightPlugin { + val statusBarHeight: Int + get() { return 200 } +} diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/Application.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/Application.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/Application.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/Application.kt diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumModule.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumModule.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/AquariumModule.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumModule.kt diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt similarity index 92% rename from app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt index 603e23a..40ee6d2 100644 --- a/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt +++ b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/AquariumStorage.kt @@ -18,9 +18,9 @@ package dev.teogor.drifter.demo import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import dev.teogor.drifter.common.UnityPlayerPrefs -import dev.teogor.drifter.common.UnityPrefAccess -import dev.teogor.drifter.common.createSerializable +import dev.teogor.drifter.core.UnityPlayerPrefs +import dev.teogor.drifter.core.UnityPrefAccess +import dev.teogor.drifter.core.createSerializable import dev.teogor.drifter.demo.models.CycleOption class AquariumStorage : UnityPlayerPrefs() { diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt similarity index 99% rename from app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt index e0e06d9..9f36309 100644 --- a/app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt +++ b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/MainActivity.kt @@ -99,7 +99,7 @@ class MainActivity : ComponentActivity() { animateToWaterColor(storage.waterColor, false) cycleOption(storage.cycleOption) } - } + }, ) UnityColorPicker( diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/models/CycleOption.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/models/CycleOption.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/models/CycleOption.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/models/CycleOption.kt diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Color.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Color.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Color.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Color.kt diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Theme.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Theme.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Theme.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Theme.kt diff --git a/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Type.kt b/demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Type.kt similarity index 100% rename from app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Type.kt rename to demo/app/src/main/kotlin/dev/teogor/drifter/demo/ui/theme/Type.kt diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/demo/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_foreground.xml rename to demo/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/demo/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to demo/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/demo/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to demo/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/demo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to demo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/demo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to demo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/demo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to demo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/demo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to demo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/values/colors.xml b/demo/app/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to demo/app/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/ic_launcher_background.xml b/demo/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/values/ic_launcher_background.xml rename to demo/app/src/main/res/values/ic_launcher_background.xml diff --git a/app/src/main/res/values/strings.xml b/demo/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to demo/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/themes.xml b/demo/app/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to demo/app/src/main/res/values/themes.xml diff --git a/app/src/main/res/xml/backup_rules.xml b/demo/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from app/src/main/res/xml/backup_rules.xml rename to demo/app/src/main/res/xml/backup_rules.xml diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/demo/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from app/src/main/res/xml/data_extraction_rules.xml rename to demo/app/src/main/res/xml/data_extraction_rules.xml diff --git a/app/src/main/res/xml/wallpaper.xml b/demo/app/src/main/res/xml/wallpaper.xml similarity index 100% rename from app/src/main/res/xml/wallpaper.xml rename to demo/app/src/main/res/xml/wallpaper.xml diff --git a/module-unity/.gitignore b/demo/module-unity/.gitignore similarity index 100% rename from module-unity/.gitignore rename to demo/module-unity/.gitignore diff --git a/module-unity/README.md b/demo/module-unity/README.md similarity index 100% rename from module-unity/README.md rename to demo/module-unity/README.md diff --git a/module-unity/build.gradle.kts b/demo/module-unity/build.gradle.kts similarity index 92% rename from module-unity/build.gradle.kts rename to demo/module-unity/build.gradle.kts index 7986a8e..42518e3 100644 --- a/module-unity/build.gradle.kts +++ b/demo/module-unity/build.gradle.kts @@ -41,6 +41,7 @@ android { version = "2022.3.7f1" ndkVersion = "23.1.7779620" + // TODO default to `getSafeDrifterUnityPathNdk` ndkPath = getSafeDrifterUnityPathNdk() platforms = listOf( @@ -50,12 +51,13 @@ android { configuration = Configuration.Release streamingAssets += unityStreamingAssetsList + // TODO default to `getSafeDrifterUnityPathExport` exportFolder = getSafeDrifterUnityPathExport() } } dependencies { - implementation(projects.drifterWallpaper) + implementation(projects.wallpaper) implementation(libs.appcompat) implementation(libs.gson) diff --git a/module-unity/gradle.properties b/demo/module-unity/gradle.properties similarity index 100% rename from module-unity/gradle.properties rename to demo/module-unity/gradle.properties diff --git a/module-unity/src/main/AndroidManifest.xml b/demo/module-unity/src/main/AndroidManifest.xml similarity index 100% rename from module-unity/src/main/AndroidManifest.xml rename to demo/module-unity/src/main/AndroidManifest.xml diff --git a/docs/assets/winds/drifter-bom.json b/docs/assets/winds/drifter-bom.json new file mode 100644 index 0000000..88443ef --- /dev/null +++ b/docs/assets/winds/drifter-bom.json @@ -0,0 +1,248 @@ +[ + { + "module": "dev.teogor.drifter:drifter-bom", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000, + "dependencies": [ + { + "module": "dev.teogor.drifter:drifter-codegen", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-bom", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-common", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-compose", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-integration", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-wallpaper", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-ksp", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-runtime", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-unity-common", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-unity-2022-3-7f1", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + } + ] + }, + { + "module": "dev.teogor.drifter:drifter-bom", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400, + "dependencies": [ + { + "module": "dev.teogor.drifter:drifter-bom", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-codegen", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-ksp", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-compose", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-integration", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-runtime", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-wallpaper", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-unity-common", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-unity-2022-3-7f1", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1709078400 + }, + { + "module": "dev.teogor.drifter:drifter-core", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 2 + }, + "date": 1724150675 + } + ] + } +] \ No newline at end of file diff --git a/docs/assets/winds/drifter-unity.json b/docs/assets/winds/drifter-unity.json new file mode 100644 index 0000000..4d646e5 --- /dev/null +++ b/docs/assets/winds/drifter-unity.json @@ -0,0 +1,37 @@ +[ + { + "module": "dev.teogor.drifter:drifter-unity", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000, + "dependencies": [ + { + "module": "dev.teogor.drifter:drifter-unity-common", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + }, + { + "module": "dev.teogor.drifter:drifter-unity-2022-3-7f1", + "version": { + "major": 1, + "minor": 0, + "patch": 0, + "flag": "Alpha", + "versionQualifier": 1 + }, + "date": 1695696000 + } + ] + } +] \ No newline at end of file diff --git a/docs/bom/bom-mapping.md b/docs/bom/bom-mapping.md new file mode 100644 index 0000000..c4add6c --- /dev/null +++ b/docs/bom/bom-mapping.md @@ -0,0 +1,20 @@ +# BOM to library version mapping + +[//]: # (REGION-BOM-TO-LIBRARY-VERSION-MAPPING) + +**BOM version 1.0.0-alpha02** + +| Library group | BOM Versions | +|:----------------------------------------------|:---------------:| +| dev.teogor.drifter:drifter-codegen | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-compose | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-core | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-integration | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-ksp | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-runtime | 1.0.0-alpha02 | +| dev.teogor.drifter:drifter-unity-2022-3-7f1 | 1.0.0-alpha01 | +| dev.teogor.drifter:drifter-unity-common | 1.0.0-alpha01 | +| dev.teogor.drifter:drifter-wallpaper | 1.0.0-alpha02 | + +[//]: # (REGION-BOM-TO-LIBRARY-VERSION-MAPPING) + diff --git a/docs/bom/implementation.md b/docs/bom/implementation.md new file mode 100644 index 0000000..43fb9f4 --- /dev/null +++ b/docs/bom/implementation.md @@ -0,0 +1,160 @@ +# BoM + +[//]: # (REGION-DEPENDENCIES) + +## Getting Started with BoM + +**Adding Dependencies:** + +* **Manual Setup:** This section guides you through adding BoM dependencies directly to your project's `build.gradle` files. ([Link to Manual Dependency Setup Section](#adding-bom-dependencies-manually)) +* **Version Catalog (Recommended):** For a more streamlined approach, consider integrating a version catalog. This allows for centralized version management and easier updates. ([Link to Version Catalog Section](#managing-bom-versions-with-version-catalog-recommended)) + +**Note:** If you prefer manual dependency setup, follow the instructions in the "Manual Setup" section. Otherwise, jump to the "Version Catalog" section for centralized management. + +For information on using the KAPT plugin, see the [KAPT documentation](https://kotlinlang.org/docs/kapt.html). +For information on using the KSP plugin, see the [KSP quick-start documentation](https://kotlinlang.org/docs/ksp-quickstart.html). +For more information about dependencies, see [Add Build Dependencies](https://developer.android.com/studio/build/dependencies). + +### Adding BoM Dependencies Manually + +To use BoM in your app, add the following dependencies to your app's `build.gradle` file: + +=== "Groovy" + + ```groovy title="build.gradle" + dependencies { + def teogorDrifterBom = "1.0.0-alpha02" + + implementation "dev.teogor.drifter:drifter-bom:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-codegen:$teogorDrifterBom" + + // To use Kotlin annotation processing tool (kapt) + kapt "dev.teogor.drifter:drifter-ksp:$teogorDrifterBom" + // To use Kotlin Symbol Processing (KSP) + ksp "dev.teogor.drifter:drifter-ksp:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-compose:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-core:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-integration:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-runtime:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-wallpaper:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-unity-common:$teogorDrifterBom" + implementation "dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterBom" + } + ``` + +=== "Kotlin" + + ```kotlin title="build.gradle.kts" + dependencies { + val teogorDrifterBom = "1.0.0-alpha02" + + implementation("dev.teogor.drifter:drifter-bom:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-codegen:$teogorDrifterBom") + + // To use Kotlin annotation processing tool (kapt) + kapt("dev.teogor.drifter:drifter-ksp:$teogorDrifterBom") + // To use Kotlin Symbol Processing (KSP) + ksp("dev.teogor.drifter:drifter-ksp:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-compose:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-core:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-integration:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-runtime:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-wallpaper:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-unity-common:$teogorDrifterBom") + implementation("dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterBom") + } + ``` + +### Managing BoM Versions with Version Catalog (Recommended) + +This section guides you through utilizing a version catalog for centralized management of BoM dependencies in your project. This approach simplifies updates and ensures consistency. + +First, define the dependencies in the `libs.versions.toml` file: + +- **Group-Name Based:** This approach is used for declaring libraries referenced by group and artifact name. +- **Module Based:** This approach is used for declaring libraries referenced by their module. + +=== "Group-Name Based" + + ```toml title="gradle/libs.versions.toml" + [versions] + teogor-drifter-bom = "1.0.0-alpha02" + + [libraries] + teogor-drifter-bom = { group = "dev.teogor.drifter", name = "drifter-bom", version.ref = "teogor-drifter-bom" } + teogor-drifter-codegen = { group = "dev.teogor.drifter", name = "drifter-codegen" } + teogor-drifter-ksp = { group = "dev.teogor.drifter", name = "drifter-ksp" } + teogor-drifter-compose = { group = "dev.teogor.drifter", name = "drifter-compose" } + teogor-drifter-core = { group = "dev.teogor.drifter", name = "drifter-core" } + teogor-drifter-integration = { group = "dev.teogor.drifter", name = "drifter-integration" } + teogor-drifter-runtime = { group = "dev.teogor.drifter", name = "drifter-runtime" } + teogor-drifter-wallpaper = { group = "dev.teogor.drifter", name = "drifter-wallpaper" } + teogor-drifter-unity-common = { group = "dev.teogor.drifter", name = "drifter-unity-common" } + teogor-drifter-unity-2022-3-7f1 = { group = "dev.teogor.drifter", name = "drifter-unity-2022-3-7f1" } + ``` + +=== "Module Based" + + ```toml title="gradle/libs.versions.toml" + [versions] + teogor-drifter-bom = "1.0.0-alpha02" + + [libraries] + teogor-drifter-bom = { module = "dev.teogor.drifter:drifter-bom", version.ref = "teogor-drifter-bom" } + teogor-drifter-codegen = { module = "dev.teogor.drifter:drifter-codegen" } + teogor-drifter-ksp = { module = "dev.teogor.drifter:drifter-ksp" } + teogor-drifter-compose = { module = "dev.teogor.drifter:drifter-compose" } + teogor-drifter-core = { module = "dev.teogor.drifter:drifter-core" } + teogor-drifter-integration = { module = "dev.teogor.drifter:drifter-integration" } + teogor-drifter-runtime = { module = "dev.teogor.drifter:drifter-runtime" } + teogor-drifter-wallpaper = { module = "dev.teogor.drifter:drifter-wallpaper" } + teogor-drifter-unity-common = { module = "dev.teogor.drifter:drifter-unity-common" } + teogor-drifter-unity-2022-3-7f1 = { module = "dev.teogor.drifter:drifter-unity-2022-3-7f1" } + ``` + +Then, add these dependencies in your app's `build.gradle` file: + +=== "Groovy" + + ```groovy title="build.gradle" + dependencies { + implementation platform(libs.teogor.drifter.bom) + implementation libs.teogor.drifter.codegen + + // To use Kotlin annotation processing tool (kapt) + kapt libs.teogor.drifter.ksp + // To use Kotlin Symbol Processing (KSP) + ksp libs.teogor.drifter.ksp + implementation libs.teogor.drifter.compose + implementation libs.teogor.drifter.core + implementation libs.teogor.drifter.integration + implementation libs.teogor.drifter.runtime + implementation libs.teogor.drifter.wallpaper + implementation libs.teogor.drifter.unity.common + implementation libs.teogor.drifter.unity.2022.3.7f1 + } + ``` + +=== "Kotlin" + + ```kotlin title="build.gradle.kts" + dependencies { + implementation(platform(libs.teogor.drifter.bom)) + implementation(libs.teogor.drifter.codegen) + + // To use Kotlin annotation processing tool (kapt) + kapt(libs.teogor.drifter.ksp) + // To use Kotlin Symbol Processing (KSP) + ksp(libs.teogor.drifter.ksp) + implementation(libs.teogor.drifter.compose) + implementation(libs.teogor.drifter.core) + implementation(libs.teogor.drifter.integration) + implementation(libs.teogor.drifter.runtime) + implementation(libs.teogor.drifter.wallpaper) + implementation(libs.teogor.drifter.unity.common) + implementation(libs.teogor.drifter.unity.2022.3.7f1) + } + ``` + +[//]: # (REGION-DEPENDENCIES) + diff --git a/docs/bom/index.md b/docs/bom/index.md new file mode 100644 index 0000000..8c03c24 --- /dev/null +++ b/docs/bom/index.md @@ -0,0 +1,89 @@ +# Using the Bill of Materials + +The BoM Bill of Materials (BOM) lets you manage all of your BoM library versions by +specifying only the BOM’s version. The BOM itself has links to the stable versions of the different +BoM libraries, in such a way that they work well together. When using the BOM in your app, you +don't need to add any version to the BoM library dependencies themselves. When you update the +BOM version, all the libraries that you're using are automatically updated to their new versions. + +To find out which BoM library versions are mapped to a specific BOM version, check out +the [BOM to library version mapping](bom-mapping.md). + +[//]: # (REGION-DIFFERENT-LIBRARY-VERSION-USAGE) + +### How do I use a different library version than what's designated in the BOM? + +In the `build.gradle` dependencies section, keep the import of the BOM platform. On the library +dependency import, specify the desired version. For example, here's how to declare dependencies if +you want to use a different version of Core, no matter what version is designated +in the BOM: + +```groovy +dependencies { + // Import the BoM BOM + implementation platform('dev.teogor.drifter:drifter-bom:1.0.0-alpha02') + + // Import Core library + implementation 'dev.teogor.drifter:drifter-core:1.0.0-alpha02' + + // Import other BoM libraries without version numbers + // .. + implementation 'dev.teogor.drifter:drifter-core' +} +``` + +[//]: # (REGION-DIFFERENT-LIBRARY-VERSION-USAGE) + +### Does the BOM automatically add all the BoM libraries to my app? + +No. To actually add and use BoM libraries in your app, you must declare each library as a +separate dependency line in your module (app-level) Gradle file (usually `app/build.gradle`). + +Using the BOM ensures that the versions of any BoM libraries in your app are compatible, but the +BOM doesn't actually add those BoM libraries to your app. + +### Why is the BOM the recommended way to manage BoM library versions? + +Going forward, BoM libraries will be versioned independently, which means version numbers will +start to be incremented at their own pace. The latest stable releases of each library are tested and +guaranteed to work nicely together. However, finding the latest stable versions of each library can +be difficult, and the BOM helps you to automatically use these latest versions. + +### Am I forced to use the BOM? + +No. You can still choose to add each dependency version manually. However, we recommend using the +BOM as it will make it easier to use all of the latest stable versions at the same time. + +[//]: # (REGION-BOM-WITH-VERSION-CATALOG) + +### Does the BOM work with version catalogs? + +Yes. You can include the BOM itself in the version catalog, and omit the other BoM library versions: + +```toml +[libraries] +teogor-drifter-bom = { group = "dev.teogor.drifter", name = "drifter-bom", version.ref = "teogor-drifter-bom" } +teogor-drifter-core = { group = "dev.teogor.drifter", name = "drifter-core" } +``` + +Don’t forget to import the BOM in your module’s `build.gradle`: + +```groovy +dependencies { + val teogorDrifterBom = platform(libs.teogor.drifter.bom) + implementation(teogorDrifterBom) + androidTestImplementation(teogorDrifterBom) + + // import BoM dependencies as usual +} +``` + +[//]: # (REGION-BOM-WITH-VERSION-CATALOG) + +[//]: # (REGION-REPORT-ISSUE-FEEDBACK) + +### How do I report an issue or offer feedback on the BOM? + +You can file issues on our [issue tracker 🔗](https://github.com/teogor/drifter/issues). + +[//]: # (REGION-REPORT-ISSUE-FEEDBACK) diff --git a/docs/releases/unity.md b/docs/releases/unity.md new file mode 100644 index 0000000..1cd877f --- /dev/null +++ b/docs/releases/unity.md @@ -0,0 +1,73 @@ +# Drifter Unity + +Learn more: **[User Guide](../user-guide.md)** and **[Code Samples](../code-samples.md)** + +🎮 Drifter simplifies the integration between Unity and Android, enhancing performance seamlessly and effortlessly. + +[//]: # (REGION-API-REFERENCE) + +API Reference +[`dev.teogor.drifter:drifter-unity-*`](../html/unity) +[`dev.teogor.drifter:drifter-unity-common`](../html/unity/common) +[`dev.teogor.drifter:drifter-unity-2022-3-7f1`](../html/unity/v2022-3-7f1) + +[//]: # (REGION-API-REFERENCE) + +[//]: # (REGION-RELEASE-TABLE) + +| Latest Update | Stable Release | Release Candidate | Beta Release | Alpha Release | +|:---------------------|:----------------:|:-------------------:|:--------------:|:---------------:| +| September 26, 2023 | - | - | - | 1.0.0-alpha01 | + +[//]: # (REGION-RELEASE-TABLE) + +[//]: # (REGION-DEPENDENCIES) + +## Declaring dependencies + +To use Unity in your app, add the following dependencies to your app's `build.gradle` file: + +=== "Groovy" + + ```groovy title="build.gradle" + dependencies { + def teogorDrifterUnity = "1.0.0-alpha01" + + implementation "dev.teogor.drifter:drifter-unity-common:$teogorDrifterUnity" + implementation "dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterUnity" + } + ``` + +=== "Kotlin" + + ```kotlin title="build.gradle.kts" + dependencies { + val teogorDrifterUnity = "1.0.0-alpha01" + + implementation("dev.teogor.drifter:drifter-unity-common:$teogorDrifterUnity") + implementation("dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterUnity") + } + ``` + +For comprehensive instructions on adding these dependencies, refer to the [Unity documentation](../unity/index.md#getting-started-with-unity). + +[//]: # (REGION-DEPENDENCIES) + +[//]: # (REGION-FEEDBACK) + +## Feedback + +Your feedback helps make Unity better. Let us know if you discover new issues or have +ideas for improving this library. Please take a look at the [existing issues on GitHub](https://github.com/teogor/drifter/issues) +for this library before you create a new one. + +[Create a new issue](https://github.com/teogor/drifter/issues/new){ .md-button } + +[//]: # (REGION-FEEDBACK) + +[//]: # (REGION-VERSION-CHANGELOG) + + + +[//]: # (REGION-VERSION-CHANGELOG) + diff --git a/docs/unity/index.md b/docs/unity/index.md new file mode 100644 index 0000000..a7fbc9f --- /dev/null +++ b/docs/unity/index.md @@ -0,0 +1,96 @@ +# Unity + +[//]: # (REGION-DEPENDENCIES) + +## Getting Started with Unity + +**Adding Dependencies:** + +* **Manual Setup:** This section guides you through adding Unity dependencies directly to your project's `build.gradle` files. ([Link to Manual Dependency Setup Section](#adding-unity-dependencies-manually)) +* **Version Catalog (Recommended):** For a more streamlined approach, consider integrating a version catalog. This allows for centralized version management and easier updates. ([Link to Version Catalog Section](#managing-unity-versions-with-version-catalog-recommended)) + +**Note:** If you prefer manual dependency setup, follow the instructions in the "Manual Setup" section. Otherwise, jump to the "Version Catalog" section for centralized management. + +For information on using the KAPT plugin, see the [KAPT documentation](https://kotlinlang.org/docs/kapt.html). +For information on using the KSP plugin, see the [KSP quick-start documentation](https://kotlinlang.org/docs/ksp-quickstart.html). +For more information about dependencies, see [Add Build Dependencies](https://developer.android.com/studio/build/dependencies). + +### Adding Unity Dependencies Manually + +To use Unity in your app, add the following dependencies to your app's `build.gradle` file: + +=== "Groovy" + + ```groovy title="build.gradle" + dependencies { + def teogorDrifterUnity = "1.0.0-alpha01" + + implementation "dev.teogor.drifter:drifter-unity-common:$teogorDrifterUnity" + implementation "dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterUnity" + } + ``` + +=== "Kotlin" + + ```kotlin title="build.gradle.kts" + dependencies { + val teogorDrifterUnity = "1.0.0-alpha01" + + implementation("dev.teogor.drifter:drifter-unity-common:$teogorDrifterUnity") + implementation("dev.teogor.drifter:drifter-unity-2022-3-7f1:$teogorDrifterUnity") + } + ``` + +### Managing Unity Versions with Version Catalog (Recommended) + +This section guides you through utilizing a version catalog for centralized management of Unity dependencies in your project. This approach simplifies updates and ensures consistency. + +First, define the dependencies in the `libs.versions.toml` file: + +- **Group-Name Based:** This approach is used for declaring libraries referenced by group and artifact name. +- **Module Based:** This approach is used for declaring libraries referenced by their module. + +=== "Group-Name Based" + + ```toml title="gradle/libs.versions.toml" + [versions] + teogor-drifter-unity = "1.0.0-alpha01" + + [libraries] + teogor-drifter-unity-common = { group = "dev.teogor.drifter", name = "drifter-unity-common", version.ref = "teogor-drifter-unity" } + teogor-drifter-unity-2022-3-7f1 = { group = "dev.teogor.drifter", name = "drifter-unity-2022-3-7f1", version.ref = "teogor-drifter-unity" } + ``` + +=== "Module Based" + + ```toml title="gradle/libs.versions.toml" + [versions] + teogor-drifter-unity = "1.0.0-alpha01" + + [libraries] + teogor-drifter-unity-common = { module = "dev.teogor.drifter:drifter-unity-common", version.ref = "teogor-drifter-unity" } + teogor-drifter-unity-2022-3-7f1 = { module = "dev.teogor.drifter:drifter-unity-2022-3-7f1", version.ref = "teogor-drifter-unity" } + ``` + +Then, add these dependencies in your app's `build.gradle` file: + +=== "Groovy" + + ```groovy title="build.gradle" + dependencies { + implementation libs.teogor.drifter.unity.common + implementation libs.teogor.drifter.unity.2022.3.7f1 + } + ``` + +=== "Kotlin" + + ```kotlin title="build.gradle.kts" + dependencies { + implementation(libs.teogor.drifter.unity.common) + implementation(libs.teogor.drifter.unity.2022.3.7f1) + } + ``` + +[//]: # (REGION-DEPENDENCIES) + diff --git a/drifter-common/api/drifter-common.api b/drifter-common/api/drifter-common.api deleted file mode 100644 index d310133..0000000 --- a/drifter-common/api/drifter-common.api +++ /dev/null @@ -1,20 +0,0 @@ -public final class dev/teogor/drifter/common/Serializable { - public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V -} - -public class dev/teogor/drifter/common/UnityMessageSender { - public fun (Ljava/lang/String;)V - public final fun sendMessage (Ljava/lang/String;Lorg/json/JSONObject;)V -} - -public class dev/teogor/drifter/common/UnityPlayerPrefs { - public fun ()V - protected fun get (Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/common/Serializable;)Ljava/lang/Object; - public static synthetic fun get$default (Ldev/teogor/drifter/common/UnityPlayerPrefs;Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/common/Serializable;ILjava/lang/Object;)Ljava/lang/Object; - protected fun set (Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/common/Serializable;)Ljava/lang/Object; - public static synthetic fun set$default (Ldev/teogor/drifter/common/UnityPlayerPrefs;Ljava/lang/String;Ljava/lang/Object;Ldev/teogor/drifter/common/Serializable;ILjava/lang/Object;)Ljava/lang/Object; -} - -public abstract interface annotation class dev/teogor/drifter/common/UnityPrefAccess : java/lang/annotation/Annotation { -} - diff --git a/drifter-plugin/.gitignore b/gradle-plugin/.gitignore similarity index 100% rename from drifter-plugin/.gitignore rename to gradle-plugin/.gitignore diff --git a/drifter-plugin/api/drifter-plugin.api b/gradle-plugin/api/gradle-plugin.api similarity index 97% rename from drifter-plugin/api/drifter-plugin.api rename to gradle-plugin/api/gradle-plugin.api index bf6c44b..0104dee 100644 --- a/drifter-plugin/api/drifter-plugin.api +++ b/gradle-plugin/api/gradle-plugin.api @@ -1,9 +1,3 @@ -public final class dev/teogor/drifter/BuildConfig { - public static final field INSTANCE Ldev/teogor/drifter/BuildConfig; - public static final field NAME Ljava/lang/String; - public static final field VERSION Ljava/lang/String; -} - public class dev/teogor/drifter/plugin/BuildIl2CppTask : org/gradle/api/DefaultTask { public fun ()V public final fun buildIl2Cpp ()V diff --git a/drifter-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts similarity index 81% rename from drifter-plugin/build.gradle.kts rename to gradle-plugin/build.gradle.kts index 3997bc5..2a7df44 100644 --- a/drifter-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -18,10 +18,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `kotlin-dsl` - id("com.gradle.plugin-publish") version "1.1.0" + id("com.gradle.plugin-publish") version "1.2.1" alias(libs.plugins.buildconfig) - // todo Crashes - // alias(libs.plugins.teogor.winds) + alias(libs.plugins.teogor.winds) } java { @@ -72,12 +71,25 @@ gradlePlugin { } } -group = "dev.teogor.drifter" -version = "1.0.0-alpha02" +winds { + moduleMetadata { + artifactDescriptor { + name = "Gradle Plugin" + } -buildConfig { - packageName(group.toString()) + documentationBuilder { + pluginIds += listOf( + "dev.teogor.drifter", + ) + } + } +} + +afterEvaluate { + buildConfig { + packageName(group.toString()) - buildConfigField("String", "NAME", "\"${group}\"") - buildConfigField("String", "VERSION", "\"${version}\"") + buildConfigField("String", "NAME", "\"${group}\"") + buildConfigField("String", "VERSION", "\"${version}\"") + } } diff --git a/drifter-plugin/gradle.properties b/gradle-plugin/gradle.properties similarity index 100% rename from drifter-plugin/gradle.properties rename to gradle-plugin/gradle.properties diff --git a/drifter-plugin/settings.gradle.kts b/gradle-plugin/settings.gradle.kts similarity index 97% rename from drifter-plugin/settings.gradle.kts rename to gradle-plugin/settings.gradle.kts index e5da095..8084a1b 100644 --- a/drifter-plugin/settings.gradle.kts +++ b/gradle-plugin/settings.gradle.kts @@ -38,5 +38,3 @@ dependencyResolutionManagement { } rootProject.name = "gradle-plugin" - -include(":gradle-plugin-api") diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/BuildIl2CppTask.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/BuildIl2CppTask.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/BuildIl2CppTask.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/BuildIl2CppTask.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterPlugin.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterPlugin.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterPlugin.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterPlugin.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterProperties.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterProperties.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterProperties.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/DrifterProperties.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/InternalDrifterApi.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/InternalDrifterApi.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/InternalDrifterApi.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/InternalDrifterApi.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityAssetSyncTask.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityAssetSyncTask.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityAssetSyncTask.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityAssetSyncTask.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt similarity index 97% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt index 8b327f9..8a4e54e 100644 --- a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt +++ b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityBuildTask.kt @@ -21,7 +21,7 @@ import dev.teogor.drifter.plugin.models.UnityOptions import org.gradle.api.Project fun Project.unityBuildTask( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *, *>, unityOptions: UnityOptions, ) { val buildIl2CppTask = project.tasks.getByName("buildIl2Cpp") diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt similarity index 95% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt index b9e96d9..8c54662 100644 --- a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt +++ b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityManifestPlaceholders.kt @@ -24,7 +24,7 @@ import dev.teogor.drifter.plugin.models.UnityOptions * * @param unityOptions The Unity options. */ -fun CommonExtension<*, *, *, *, *>.applyUnityManifestPlaceholders( +fun CommonExtension<*, *, *, *, *, *>.applyUnityManifestPlaceholders( unityOptions: UnityOptions, ) { defaultConfig { diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt similarity index 96% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt index 160362f..46adae2 100644 --- a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt +++ b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/UnityOptions.kt @@ -27,7 +27,7 @@ import org.gradle.kotlin.dsl.dependencies * @param androidConfig The common extension of the Android project. */ fun Project.unityOptions( - androidConfig: CommonExtension<*, *, *, *, *>, + androidConfig: CommonExtension<*, *, *, *, *, *>, configure: UnityOptions.() -> Unit, ) { val unityOptions = UnityOptions().apply(configure) diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/Configuration.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/Configuration.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/Configuration.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/Configuration.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/PlatformArch.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/PlatformArch.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/PlatformArch.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/PlatformArch.kt diff --git a/drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/UnityOptions.kt b/gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/UnityOptions.kt similarity index 100% rename from drifter-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/UnityOptions.kt rename to gradle-plugin/src/main/kotlin/dev/teogor/drifter/plugin/models/UnityOptions.kt diff --git a/drifter-wallpaper/.gitignore b/integration/.gitignore similarity index 100% rename from drifter-wallpaper/.gitignore rename to integration/.gitignore diff --git a/drifter-integration/api/drifter-integration.api b/integration/api/integration.api similarity index 100% rename from drifter-integration/api/drifter-integration.api rename to integration/api/integration.api diff --git a/drifter-integration/build.gradle.kts b/integration/build.gradle.kts similarity index 92% rename from drifter-integration/build.gradle.kts rename to integration/build.gradle.kts index 71ad04c..082c940 100644 --- a/drifter-integration/build.gradle.kts +++ b/integration/build.gradle.kts @@ -14,8 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.teogor.winds) @@ -52,7 +50,6 @@ dependencies { implementation(libs.appcompat) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/drifter-integration/consumer-rules.pro b/integration/consumer-rules.pro similarity index 100% rename from drifter-integration/consumer-rules.pro rename to integration/consumer-rules.pro diff --git a/drifter-integration/proguard-rules.pro b/integration/proguard-rules.pro similarity index 100% rename from drifter-integration/proguard-rules.pro rename to integration/proguard-rules.pro diff --git a/drifter-integration/src/main/AndroidManifest.xml b/integration/src/main/AndroidManifest.xml similarity index 100% rename from drifter-integration/src/main/AndroidManifest.xml rename to integration/src/main/AndroidManifest.xml diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/activities/OverrideUnityActivity.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/activities/OverrideUnityActivity.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/activities/OverrideUnityActivity.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/activities/OverrideUnityActivity.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/activities/UnityPlayerInstantiatorActivity.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/activities/UnityPlayerInstantiatorActivity.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/activities/UnityPlayerInstantiatorActivity.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/activities/UnityPlayerInstantiatorActivity.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/common/TypeConverter.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/common/TypeConverter.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/common/TypeConverter.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/common/TypeConverter.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/AndroidUtils.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/AndroidUtils.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/AndroidUtils.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/AndroidUtils.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/IUnityPlayerInstanceCreatedListener.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/IUnityPlayerInstanceCreatedListener.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/IUnityPlayerInstanceCreatedListener.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/IUnityPlayerInstanceCreatedListener.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Message.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/Message.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Message.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/Message.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/PlayerPrefs.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/PlayerPrefs.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/PlayerPrefs.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/PlayerPrefs.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/SharedElement.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/SharedElement.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/SharedElement.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/SharedElement.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Storage.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/Storage.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Storage.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/Storage.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityCallback.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityCallback.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityCallback.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityCallback.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityControllerBase.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityControllerBase.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityControllerBase.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityControllerBase.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityDispatcher.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityDispatcher.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityDispatcher.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityDispatcher.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityStorageBase.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityStorageBase.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityStorageBase.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/UnityStorageBase.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Validator.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/core/Validator.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/core/Validator.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/core/Validator.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityContextProvider.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityContextProvider.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityContextProvider.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityContextProvider.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTracker.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTracker.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTracker.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTracker.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTrackerInitializer.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTrackerInitializer.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTrackerInitializer.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/initializer/ActivityTrackerInitializer.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector2.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector2.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector2.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector2.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector3.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector3.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector3.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/model/Vector3.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerHolder.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerHolder.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerHolder.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerHolder.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerInstanceManager.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerInstanceManager.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerInstanceManager.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerInstanceManager.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerPauseResumeManager.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerPauseResumeManager.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerPauseResumeManager.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerPauseResumeManager.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapper.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapper.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapper.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapper.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapperInstantiator.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapperInstantiator.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapperInstantiator.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/player/UnityPlayerWrapperInstantiator.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ActivityThemeUtility.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ActivityThemeUtility.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ActivityThemeUtility.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ActivityThemeUtility.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DataSync.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DataSync.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DataSync.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DataSync.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DebugLog.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DebugLog.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DebugLog.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/DebugLog.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/Extensions.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/Extensions.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/Extensions.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/Extensions.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/MultiTapDetector.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/MultiTapDetector.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/MultiTapDetector.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/MultiTapDetector.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ReflectionUtility.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ReflectionUtility.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ReflectionUtility.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/ReflectionUtility.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/StandardExceptionHandler.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/StandardExceptionHandler.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/StandardExceptionHandler.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/StandardExceptionHandler.kt diff --git a/drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/UnityVersionInfo.kt b/integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/UnityVersionInfo.kt similarity index 100% rename from drifter-integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/UnityVersionInfo.kt rename to integration/src/main/kotlin/dev/teogor/drifter/integration/utilities/UnityVersionInfo.kt diff --git a/drifter-integration/src/main/res/values/styles.xml b/integration/src/main/res/values/styles.xml similarity index 100% rename from drifter-integration/src/main/res/values/styles.xml rename to integration/src/main/res/values/styles.xml diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index f67d390..c484aa6 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -14,10 +14,9 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java-library") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.teogor.winds) } @@ -28,12 +27,11 @@ java { } tasks.withType().configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget = JvmTarget.JVM_11 } } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/settings.gradle.kts b/settings.gradle.kts index 9e2c515..1fd7d80 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,7 @@ pluginManagement { - includeBuild("${rootProject.projectDir}\\drifter-plugin") { - name = "drifter-gradle-plugin-test" + // TODO better way of testing and including plugin + includeBuild("${rootProject.projectDir}\\gradle-plugin") { + name = "drifter-plugin" } repositories { google() @@ -23,18 +24,22 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "Drifter" // Demo Application -include(":app") -include(":module-unity") +include(":demo:app") +include(":demo:module-unity") // Drifter -include(":drifter-bom") -include(":drifter-common") -include(":drifter-compose") -include(":drifter-integration") -include(":drifter-plugin") -include(":drifter-wallpaper") +include(":bom") include(":codegen") -include(":ksp") +include(":compiler") +include(":compose") +include(":core") +include(":integration") include(":runtime") +include(":wallpaper") + +// Plugin +include(":gradle-plugin") + +// Unity include(":unity:common") include(":unity:v2022-3-7f1") diff --git a/unity/build.gradle.kts b/unity/build.gradle.kts index 632f68a..2bcdc13 100644 --- a/unity/build.gradle.kts +++ b/unity/build.gradle.kts @@ -14,7 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost import dev.teogor.winds.api.ArtifactIdFormat import dev.teogor.winds.ktx.createVersion @@ -22,7 +21,6 @@ plugins { alias(libs.plugins.teogor.winds) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { @@ -33,8 +31,8 @@ winds { artifactIdFormat = ArtifactIdFormat.FULL } - publishingOptions { - publish = false + publishing { + enabled = false } } } diff --git a/unity/common/build.gradle.kts b/unity/common/build.gradle.kts index 7a2e1c8..7981e2b 100644 --- a/unity/common/build.gradle.kts +++ b/unity/common/build.gradle.kts @@ -14,8 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.teogor.winds) @@ -35,11 +33,10 @@ dependencies { api(libs.ceres.core.register) implementation(libs.androidx.startup.runtime) - implementation(libs.gson) implementation(libs.appcompat) + implementation(libs.gson) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/unity/v2022-3-7f1/build.gradle.kts b/unity/v2022-3-7f1/build.gradle.kts index 74b682e..4e88a94 100644 --- a/unity/v2022-3-7f1/build.gradle.kts +++ b/unity/v2022-3-7f1/build.gradle.kts @@ -14,15 +14,13 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.teogor.winds) } android { - namespace = "dev.teogor.drifter.core" + namespace = "dev.teogor.drifter.unity.v2022.x3.x7f1" defaultConfig { consumerProguardFiles("proguard-unity.txt") @@ -46,7 +44,6 @@ dependencies { implementation(libs.androidx.annotation) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/ksp/.gitignore b/wallpaper/.gitignore similarity index 100% rename from ksp/.gitignore rename to wallpaper/.gitignore diff --git a/drifter-wallpaper/api/drifter-wallpaper.api b/wallpaper/api/wallpaper.api similarity index 98% rename from drifter-wallpaper/api/drifter-wallpaper.api rename to wallpaper/api/wallpaper.api index cd56244..747ac85 100644 --- a/drifter-wallpaper/api/drifter-wallpaper.api +++ b/wallpaper/api/wallpaper.api @@ -18,7 +18,6 @@ public abstract interface class dev/teogor/drifter/wallpaper/ILiveWallpaperEvent public final class dev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade { public static final field Companion Ldev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade$Companion; - public synthetic fun (Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getActiveWallpaperEngine ()Ldev/teogor/drifter/wallpaper/UnityWallpaperService$UnityWallpaperEngine; public final fun getApplicationContext ()Landroid/content/Context; public final fun getMultiTapDetector ()Ldev/teogor/drifter/integration/utilities/MultiTapDetector; diff --git a/drifter-wallpaper/build.gradle.kts b/wallpaper/build.gradle.kts similarity index 89% rename from drifter-wallpaper/build.gradle.kts rename to wallpaper/build.gradle.kts index d6f11d6..26fc145 100644 --- a/drifter-wallpaper/build.gradle.kts +++ b/wallpaper/build.gradle.kts @@ -14,8 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.ceres.android.library) alias(libs.plugins.teogor.winds) @@ -45,14 +43,13 @@ android { } dependencies { - implementation(projects.drifterIntegration) + implementation(projects.integration) + implementation(libs.appcompat) implementation(libs.androidx.startup.runtime) implementation(libs.gson) - implementation(libs.appcompat) } -winds.publishingOptions.sonatypeHost = SonatypeHost.S01 winds { moduleMetadata { artifactDescriptor { diff --git a/drifter-wallpaper/consumer-rules.pro b/wallpaper/consumer-rules.pro similarity index 100% rename from drifter-wallpaper/consumer-rules.pro rename to wallpaper/consumer-rules.pro diff --git a/drifter-wallpaper/proguard-rules.pro b/wallpaper/proguard-rules.pro similarity index 100% rename from drifter-wallpaper/proguard-rules.pro rename to wallpaper/proguard-rules.pro diff --git a/drifter-wallpaper/src/main/AndroidManifest.xml b/wallpaper/src/main/AndroidManifest.xml similarity index 100% rename from drifter-wallpaper/src/main/AndroidManifest.xml rename to wallpaper/src/main/AndroidManifest.xml diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/ILiveWallpaperEventsListener.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/ILiveWallpaperEventsListener.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/ILiveWallpaperEventsListener.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/ILiveWallpaperEventsListener.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUnityFacade.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUtility.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUtility.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUtility.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/LiveWallpaperUtility.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityEventsProxy.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityEventsProxy.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityEventsProxy.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityEventsProxy.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityWallpaperService.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityWallpaperService.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityWallpaperService.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/UnityWallpaperService.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/InvisibleSelfClosingSettingsActivity.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/InvisibleSelfClosingSettingsActivity.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/InvisibleSelfClosingSettingsActivity.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/InvisibleSelfClosingSettingsActivity.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/LiveWallpaperCompatibleUnityPlayerActivity.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/LiveWallpaperCompatibleUnityPlayerActivity.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/LiveWallpaperCompatibleUnityPlayerActivity.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/LiveWallpaperCompatibleUnityPlayerActivity.kt diff --git a/drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/StartWallpaperPreviewActivity.kt b/wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/StartWallpaperPreviewActivity.kt similarity index 100% rename from drifter-wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/StartWallpaperPreviewActivity.kt rename to wallpaper/src/main/kotlin/dev/teogor/drifter/wallpaper/activities/StartWallpaperPreviewActivity.kt