Merge pull request #24 from teogor/update/dependencies-version

Update Dependencies and Refactor Codebase for Improved Maintainability

.gitignore

@@ -62,3 +62,6 @@ google-services.json
 freeline.py
 freeline/
 freeline_project_description.json
+
+# Kotlin
+.kotlin/

drifter-bom/build.gradle.kts → bom/build.gradle.kts

@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-import com.vanniktech.maven.publish.SonatypeHost
 import dev.teogor.winds.api.ArtifactIdFormat
 import dev.teogor.winds.ktx.createVersion
 
 plugins {
   alias(libs.plugins.teogor.winds)
 }
 
-winds.publishingOptions.sonatypeHost = SonatypeHost.S01
 winds {
   moduleMetadata {
     isBom = true

build.gradle.kts

@@ -1,9 +1,9 @@
-import com.vanniktech.maven.publish.SonatypeHost
 import dev.teogor.winds.api.ArtifactIdFormat
 import dev.teogor.winds.api.License
 import dev.teogor.winds.api.NameFormat
 import dev.teogor.winds.api.Person
 import dev.teogor.winds.api.Scm
+import dev.teogor.winds.api.SonatypeHost
 import dev.teogor.winds.api.TicketSystem
 import dev.teogor.winds.ktx.createVersion
 import dev.teogor.winds.ktx.person
@@ -16,13 +16,15 @@ plugins {
   alias(libs.plugins.android.library) apply false
   alias(libs.plugins.jetbrains.kotlin.android) apply false
   alias(libs.plugins.kotlin.jvm) apply true
+  alias(libs.plugins.jetbrains.compose.compiler) apply false
 
   alias(libs.plugins.ceres.android.application) apply false
   alias(libs.plugins.ceres.android.application.compose) apply false
   alias(libs.plugins.ceres.android.library) apply false
   alias(libs.plugins.ceres.android.library.compose) apply false
 
   alias(libs.plugins.teogor.winds) apply true
+  alias(libs.plugins.teogor.drifter) apply false
 
   alias(libs.plugins.vanniktech.maven) apply true
   alias(libs.plugins.dokka) apply true
@@ -41,8 +43,9 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 winds {
-  windsFeatures {
+  features {
     mavenPublishing = true
+    docsGenerator = true
   }
 
   moduleMetadata {
@@ -91,11 +94,11 @@ winds {
     }
   }
 
-  publishingOptions {
-    publish = false
+  publishing {
+    enabled = false
     enablePublicationSigning = true
     optInForVanniktechPlugin = true
-    cascadePublish = true
+    cascade = true
     sonatypeHost = SonatypeHost.S01
   }
 
@@ -106,8 +109,8 @@ winds {
 
 val excludedModulesForWinds = listOf(
   ":drifter-plugin",
-  ":app",
-  ":module-unity",
+  ":demo:app",
+  ":demo:module-unity",
 )
 
 val ktlintVersion = "0.50.0"

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<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().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 {

ksp/build.gradle.kts → 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<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().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
+  }
 }

drifter-compose/build.gradle.kts → 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 {

core/api/core.api

@@ -0,0 +1,20 @@
+public final class dev/teogor/drifter/core/Serializable {
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+}
+
+public class dev/teogor/drifter/core/UnityMessageSender {
+	public fun <init> (Ljava/lang/String;)V
+	public final fun sendMessage (Ljava/lang/String;Lorg/json/JSONObject;)V
+}
+
+public class dev/teogor/drifter/core/UnityPlayerPrefs {
+	public fun <init> ()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 {
+}
+

drifter-common/build.gradle.kts → 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"
     }
   }
 }