GH-62 Replace CDN references with Expressible references and release …

…1.11.5
dzikoysk · Oct 26, 2021 · 6bde0cb · 6bde0cb
1 parent efb83a1
commit 6bde0cb
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 171 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -36,9 +36,9 @@ repositories {
 
 dependencies {
     // Default
-    implementation 'net.dzikoysk:cdn:1.11.4'
+    implementation 'net.dzikoysk:cdn:1.11.5'
     // Kotlin wrapper
-    implementation 'net.dzikoysk:cdn-kt:1.11.4'
+    implementation 'net.dzikoysk:cdn-kt:1.11.5'
 }
 ```
 

diff --git a/cdn-kt/pom.xml b/cdn-kt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.11.4</version>
+        <version>1.11.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,6 +39,10 @@
             <groupId>net.dzikoysk</groupId>
             <artifactId>cdn</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.panda-lang</groupId>
+            <artifactId>expressible-kt</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>

diff --git a/cdn-kt/src/main/kotlin/net/dzikoysk/cdn/annotation/KotlinMemberResolver.kt b/cdn-kt/src/main/kotlin/net/dzikoysk/cdn/annotation/KotlinMemberResolver.kt
@@ -1,6 +1,6 @@
 package net.dzikoysk.cdn.annotation
 
-import net.dzikoysk.cdn.model.Reference
+import panda.std.reactive.Reference
 import panda.utilities.StringUtils
 import java.lang.reflect.Field
 import kotlin.reflect.KMutableProperty

diff --git a/cdn-kt/src/main/kotlin/net/dzikoysk/cdn/model/ReferenceExtensions.kt b/cdn-kt/src/main/kotlin/net/dzikoysk/cdn/model/ReferenceExtensions.kt
diff --git a/cdn-kt/src/test/kotlin/net/dzikoysk/cdn/kt/KotlinConfiguration.kt b/cdn-kt/src/test/kotlin/net/dzikoysk/cdn/kt/KotlinConfiguration.kt
@@ -17,7 +17,7 @@
 package net.dzikoysk.cdn.kt
 
 import net.dzikoysk.cdn.entity.Description
-import net.dzikoysk.cdn.model.reference
+import panda.std.reactive.reference
 import java.io.Serializable
 
 class KotlinConfiguration : Serializable {

diff --git a/cdn/pom.xml b/cdn/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.11.4</version>
+        <version>1.11.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnSettings.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnSettings.java
@@ -16,20 +16,20 @@
 
 package net.dzikoysk.cdn;
 
-import net.dzikoysk.cdn.annotation.MemberResolver;
 import net.dzikoysk.cdn.annotation.DefaultMemberResolver;
+import net.dzikoysk.cdn.annotation.MemberResolver;
 import net.dzikoysk.cdn.composers.EnumComposer;
 import net.dzikoysk.cdn.composers.ListComposer;
 import net.dzikoysk.cdn.composers.MapComposer;
 import net.dzikoysk.cdn.composers.ReferenceComposer;
-import net.dzikoysk.cdn.model.MutableReference;
-import net.dzikoysk.cdn.model.Reference;
 import net.dzikoysk.cdn.serialization.Composer;
 import net.dzikoysk.cdn.serialization.Deserializer;
 import net.dzikoysk.cdn.serialization.Serializer;
 import net.dzikoysk.cdn.serialization.SimpleComposer;
 import net.dzikoysk.cdn.serialization.SimpleDeserializer;
 import net.dzikoysk.cdn.serialization.SimpleSerializer;
+import panda.std.reactive.MutableReference;
+import panda.std.reactive.Reference;
 import panda.utilities.ClassUtils;
 import panda.utilities.ObjectUtils;
 import java.util.ArrayList;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/composers/ReferenceComposer.java b/cdn/src/main/java/net/dzikoysk/cdn/composers/ReferenceComposer.java
@@ -19,11 +19,11 @@
 import net.dzikoysk.cdn.CdnSettings;
 import net.dzikoysk.cdn.CdnUtils;
 import net.dzikoysk.cdn.model.Element;
-import net.dzikoysk.cdn.model.Reference;
-import net.dzikoysk.cdn.model.ReferenceUtils;
 import net.dzikoysk.cdn.serialization.Composer;
 import net.dzikoysk.cdn.serialization.Deserializer;
 import net.dzikoysk.cdn.serialization.Serializer;
+import panda.std.reactive.Reference;
+import panda.std.reactive.ReferenceUtils;
 import java.lang.reflect.AnnotatedParameterizedType;
 import java.lang.reflect.AnnotatedType;
 import java.util.List;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/MutableReference.java b/cdn/src/main/java/net/dzikoysk/cdn/model/MutableReference.java
diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/Reference.java b/cdn/src/main/java/net/dzikoysk/cdn/model/Reference.java
diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/ReferenceUtils.java b/cdn/src/main/java/net/dzikoysk/cdn/model/ReferenceUtils.java
diff --git a/cdn/src/test/groovy/net/dzikoysk/cdn/composers/ReferenceComposerTest.groovy b/cdn/src/test/groovy/net/dzikoysk/cdn/composers/ReferenceComposerTest.groovy
@@ -18,15 +18,15 @@ package net.dzikoysk.cdn.composers
 
 import groovy.transform.CompileStatic
 import net.dzikoysk.cdn.CdnSpec
-import net.dzikoysk.cdn.model.MutableReference
-import net.dzikoysk.cdn.model.Reference
 import net.dzikoysk.cdn.source.Source
 import org.junit.jupiter.api.Test
+import panda.std.reactive.MutableReference
+import panda.std.reactive.Reference
 
-import static net.dzikoysk.cdn.model.MutableReference.mutableReference
-import static net.dzikoysk.cdn.model.Reference.reference
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
+import static panda.std.reactive.MutableReference.mutableReference
+import static panda.std.reactive.Reference.reference
 
 @CompileStatic
 class ReferenceComposerTest extends CdnSpec {
@@ -44,7 +44,7 @@ class ReferenceComposerTest extends CdnSpec {
         def configuration = new ReferenceConfiguration()
 
         def subscriberCalled = false
-        configuration.mutableReference.subscribe({ updatedValue -> subscriberCalled = true })
+        configuration.mutableReference.subscribe({ subscriberCalled = true })
 
         standard.load(
                 Source.of("""

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>net.dzikoysk</groupId>
     <artifactId>cdn-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.11.4</version>
+    <version>1.11.5</version>
 
     <scm>
         <connection>scm:git:https://github.com/dzikoysk/cdn.git</connection>
@@ -58,12 +58,16 @@
         </repository>
     </distributionManagement>
 
+    <properties>
+        <expressible.version>1.1.1</expressible.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>net.dzikoysk</groupId>
                 <artifactId>cdn</artifactId>
-                <version>1.11.4</version>
+                <version>1.11.5</version>
             </dependency>
 
             <!-- General -->
@@ -75,7 +79,12 @@
             <dependency>
                 <groupId>org.panda-lang</groupId>
                 <artifactId>expressible</artifactId>
-                <version>1.0.18</version>
+                <version>${expressible.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.panda-lang</groupId>
+                <artifactId>expressible-kt</artifactId>
+                <version>${expressible.version}</version>
             </dependency>
 
             <!-- Tests -->