integrate lofi acl subproject

rescala-lang · Dec 12, 2024 · 253b9f2 · 253b9f2
1 parent 195c9a3
commit 253b9f2
Show file tree

Hide file tree

Showing 76 changed files with 6 additions and 29 deletions.
diff --git a/...notonic_acl/BucketListEntryListCell.scala → ...notonic_acl/BucketListEntryListCell.scala b/...notonic_acl/BucketListEntryListCell.scala → ...notonic_acl/BucketListEntryListCell.scala
diff --git a/...otonic_acl/ExpenseListEntryListCell.scala → ...otonic_acl/ExpenseListEntryListCell.scala b/...otonic_acl/ExpenseListEntryListCell.scala → ...otonic_acl/ExpenseListEntryListCell.scala
diff --git a/...cl/example/monotonic_acl/Invitation.scala → ...cl/example/monotonic_acl/Invitation.scala b/...cl/example/monotonic_acl/Invitation.scala → ...cl/example/monotonic_acl/Invitation.scala
diff --git a/...monotonic_acl/InvitationDialogScene.scala → ...monotonic_acl/InvitationDialogScene.scala b/...monotonic_acl/InvitationDialogScene.scala → ...monotonic_acl/InvitationDialogScene.scala
diff --git a/...acl/example/monotonic_acl/MainScene.scala → ...acl/example/monotonic_acl/MainScene.scala b/...acl/example/monotonic_acl/MainScene.scala → ...acl/example/monotonic_acl/MainScene.scala
diff --git a/...le/monotonic_acl/PermissionTreePane.scala → ...le/monotonic_acl/PermissionTreePane.scala b/...le/monotonic_acl/PermissionTreePane.scala → ...le/monotonic_acl/PermissionTreePane.scala
diff --git a/...ample/monotonic_acl/TravelPlanModel.scala → ...ample/monotonic_acl/TravelPlanModel.scala b/...ample/monotonic_acl/TravelPlanModel.scala → ...ample/monotonic_acl/TravelPlanModel.scala
diff --git a/...xample/monotonic_acl/TravelPlanView.scala → ...xample/monotonic_acl/TravelPlanView.scala b/...xample/monotonic_acl/TravelPlanView.scala → ...xample/monotonic_acl/TravelPlanView.scala
diff --git a/...e/monotonic_acl/TravelPlanViewModel.scala → ...e/monotonic_acl/TravelPlanViewModel.scala b/...e/monotonic_acl/TravelPlanViewModel.scala → ...e/monotonic_acl/TravelPlanViewModel.scala
diff --git a/...mple/monotonic_acl/TravelPlannerApp.scala → ...mple/monotonic_acl/TravelPlannerApp.scala b/...mple/monotonic_acl/TravelPlannerApp.scala → ...mple/monotonic_acl/TravelPlannerApp.scala
diff --git a/...cl/example/travelplanner/TravelPlan.scala → ...cl/example/travelplanner/TravelPlan.scala b/...cl/example/travelplanner/TravelPlan.scala → ...cl/example/travelplanner/TravelPlan.scala
diff --git a/...xample/travelplanner/TravelPlanTest.scala → ...xample/travelplanner/TravelPlanTest.scala b/...xample/travelplanner/TravelPlanTest.scala → ...xample/travelplanner/TravelPlanTest.scala
diff --git a/.../scala/lofi_acl/access/DeltaSurgeon.scala → .../scala/lofi_acl/access/DeltaSurgeon.scala b/.../scala/lofi_acl/access/DeltaSurgeon.scala → .../scala/lofi_acl/access/DeltaSurgeon.scala
diff --git a/...lofi_acl/access/EncryptedDeltaParts.scala → ...lofi_acl/access/EncryptedDeltaParts.scala b/...lofi_acl/access/EncryptedDeltaParts.scala → ...lofi_acl/access/EncryptedDeltaParts.scala
diff --git a/...c/main/scala/lofi_acl/access/Filter.scala → ...c/main/scala/lofi_acl/access/Filter.scala b/...c/main/scala/lofi_acl/access/Filter.scala → ...c/main/scala/lofi_acl/access/Filter.scala
diff --git a/...ofi_acl/access/InvalidPathException.scala → ...ofi_acl/access/InvalidPathException.scala b/...ofi_acl/access/InvalidPathException.scala → ...ofi_acl/access/InvalidPathException.scala
diff --git a/.../scala/lofi_acl/access/KeyHierarchy.scala → .../scala/lofi_acl/access/KeyHierarchy.scala b/.../scala/lofi_acl/access/KeyHierarchy.scala → .../scala/lofi_acl/access/KeyHierarchy.scala
diff --git a/...a/lofi_acl/access/PermissionManager.scala → ...a/lofi_acl/access/PermissionManager.scala b/...a/lofi_acl/access/PermissionManager.scala → ...a/lofi_acl/access/PermissionManager.scala
diff --git a/...cala/lofi_acl/access/PermissionTree.scala → ...cala/lofi_acl/access/PermissionTree.scala b/...cala/lofi_acl/access/PermissionTree.scala → ...cala/lofi_acl/access/PermissionTree.scala
diff --git a/...src/main/scala/lofi_acl/access/Rule.scala → ...src/main/scala/lofi_acl/access/Rule.scala b/...src/main/scala/lofi_acl/access/Rule.scala → ...src/main/scala/lofi_acl/access/Rule.scala
diff --git a/.../lofi_acl/ardt/base/StandardLibrary.scala → .../lofi_acl/ardt/base/StandardLibrary.scala b/.../lofi_acl/ardt/base/StandardLibrary.scala → .../lofi_acl/ardt/base/StandardLibrary.scala
diff --git a/.../lofi_acl/ardt/datatypes/AddWinsMap.scala → .../lofi_acl/ardt/datatypes/AddWinsMap.scala b/.../lofi_acl/ardt/datatypes/AddWinsMap.scala → .../lofi_acl/ardt/datatypes/AddWinsMap.scala
diff --git a/.../lofi_acl/ardt/datatypes/AddWinsSet.scala → .../lofi_acl/ardt/datatypes/AddWinsSet.scala b/.../lofi_acl/ardt/datatypes/AddWinsSet.scala → .../lofi_acl/ardt/datatypes/AddWinsSet.scala
diff --git a/...n/scala/lofi_acl/ardt/datatypes/LWW.scala → ...n/scala/lofi_acl/ardt/datatypes/LWW.scala b/...n/scala/lofi_acl/ardt/datatypes/LWW.scala → ...n/scala/lofi_acl/ardt/datatypes/LWW.scala
diff --git a/...l/ardt/datatypes/MultiValueRegister.scala → ...l/ardt/datatypes/MultiValueRegister.scala b/...l/ardt/datatypes/MultiValueRegister.scala → ...l/ardt/datatypes/MultiValueRegister.scala
diff --git a/...scala/lofi_acl/ardt/datatypes/ORMap.scala → ...scala/lofi_acl/ardt/datatypes/ORMap.scala b/...scala/lofi_acl/ardt/datatypes/ORMap.scala → ...scala/lofi_acl/ardt/datatypes/ORMap.scala
diff --git a/...lofi_acl/ardt/datatypes/TwoPhaseMap.scala → ...lofi_acl/ardt/datatypes/TwoPhaseMap.scala b/...lofi_acl/ardt/datatypes/TwoPhaseMap.scala → ...lofi_acl/ardt/datatypes/TwoPhaseMap.scala
diff --git a/...lofi_acl/ardt/datatypes/TwoPhaseSet.scala → ...lofi_acl/ardt/datatypes/TwoPhaseSet.scala b/...lofi_acl/ardt/datatypes/TwoPhaseSet.scala → ...lofi_acl/ardt/datatypes/TwoPhaseSet.scala
diff --git a/..._acl/collections/DeltaMapWithPrefix.scala → ..._acl/collections/DeltaMapWithPrefix.scala b/..._acl/collections/DeltaMapWithPrefix.scala → ..._acl/collections/DeltaMapWithPrefix.scala
diff --git a/...ala/lofi_acl/collections/DeltaStore.scala → ...ala/lofi_acl/collections/DeltaStore.scala b/...ala/lofi_acl/collections/DeltaStore.scala → ...ala/lofi_acl/collections/DeltaStore.scala
diff --git a/...n/scala/lofi_acl/collections/DotMap.scala → ...n/scala/lofi_acl/collections/DotMap.scala b/...n/scala/lofi_acl/collections/DotMap.scala → ...n/scala/lofi_acl/collections/DotMap.scala
diff --git a/...i_acl/collections/MutableDeltaStore.scala → ...i_acl/collections/MutableDeltaStore.scala b/...i_acl/collections/MutableDeltaStore.scala → ...i_acl/collections/MutableDeltaStore.scala
diff --git a/...cala/lofi_acl/crypto/CertificatePem.scala → ...cala/lofi_acl/crypto/CertificatePem.scala b/...cala/lofi_acl/crypto/CertificatePem.scala → ...cala/lofi_acl/crypto/CertificatePem.scala
diff --git a/...n/scala/lofi_acl/crypto/Ed25519Util.scala → ...n/scala/lofi_acl/crypto/Ed25519Util.scala b/...n/scala/lofi_acl/crypto/Ed25519Util.scala → ...n/scala/lofi_acl/crypto/Ed25519Util.scala
diff --git a/...ala/lofi_acl/crypto/IdentityFactory.scala → ...ala/lofi_acl/crypto/IdentityFactory.scala b/...ala/lofi_acl/crypto/IdentityFactory.scala → ...ala/lofi_acl/crypto/IdentityFactory.scala
diff --git a/...la/lofi_acl/crypto/KeyDerivationKey.scala → ...la/lofi_acl/crypto/KeyDerivationKey.scala b/...la/lofi_acl/crypto/KeyDerivationKey.scala → ...la/lofi_acl/crypto/KeyDerivationKey.scala
diff --git a/...ala/lofi_acl/crypto/PrivateIdentity.scala → ...ala/lofi_acl/crypto/PrivateIdentity.scala b/...ala/lofi_acl/crypto/PrivateIdentity.scala → ...ala/lofi_acl/crypto/PrivateIdentity.scala
diff --git a/...scala/lofi_acl/crypto/PrivateKeyPem.scala → ...scala/lofi_acl/crypto/PrivateKeyPem.scala b/...scala/lofi_acl/crypto/PrivateKeyPem.scala → ...scala/lofi_acl/crypto/PrivateKeyPem.scala
diff --git a/...cala/lofi_acl/crypto/PublicIdentity.scala → ...cala/lofi_acl/crypto/PublicIdentity.scala b/...cala/lofi_acl/crypto/PublicIdentity.scala → ...cala/lofi_acl/crypto/PublicIdentity.scala
diff --git a/...main/scala/lofi_acl/crypto/X509Util.scala → ...main/scala/lofi_acl/crypto/X509Util.scala b/...main/scala/lofi_acl/crypto/X509Util.scala → ...main/scala/lofi_acl/crypto/X509Util.scala
diff --git a/...ync/CausalityCheckingMessageHandler.scala → ...ync/CausalityCheckingMessageHandler.scala b/...ync/CausalityCheckingMessageHandler.scala → ...ync/CausalityCheckingMessageHandler.scala
diff --git a/...ala/lofi_acl/sync/ConnectionManager.scala → ...ala/lofi_acl/sync/ConnectionManager.scala b/...ala/lofi_acl/sync/ConnectionManager.scala → ...ala/lofi_acl/sync/ConnectionManager.scala
diff --git a/.../scala/lofi_acl/sync/JsoniterCodecs.scala → .../scala/lofi_acl/sync/JsoniterCodecs.scala b/.../scala/lofi_acl/sync/JsoniterCodecs.scala → .../scala/lofi_acl/sync/JsoniterCodecs.scala
diff --git a/...scala/lofi_acl/sync/MessageReceiver.scala → ...scala/lofi_acl/sync/MessageReceiver.scala b/...scala/lofi_acl/sync/MessageReceiver.scala → ...scala/lofi_acl/sync/MessageReceiver.scala
diff --git a/.../lofi_acl/sync/MessageSerialization.scala → .../lofi_acl/sync/MessageSerialization.scala b/.../lofi_acl/sync/MessageSerialization.scala → .../lofi_acl/sync/MessageSerialization.scala
diff --git a/.../acl/monotonic/FilteringAntiEntropy.scala → .../acl/monotonic/FilteringAntiEntropy.scala b/.../acl/monotonic/FilteringAntiEntropy.scala → .../acl/monotonic/FilteringAntiEntropy.scala
diff --git a/...acl/sync/acl/monotonic/MonotonicAcl.scala → ...acl/sync/acl/monotonic/MonotonicAcl.scala b/...acl/sync/acl/monotonic/MonotonicAcl.scala → ...acl/sync/acl/monotonic/MonotonicAcl.scala
diff --git a/...l/monotonic/MonotonicAclSyncMessage.scala → ...l/monotonic/MonotonicAclSyncMessage.scala b/...l/monotonic/MonotonicAclSyncMessage.scala → ...l/monotonic/MonotonicAclSyncMessage.scala
diff --git a/.../PartialReplicationPeerSubsetSolver.scala → .../PartialReplicationPeerSubsetSolver.scala b/.../PartialReplicationPeerSubsetSolver.scala → .../PartialReplicationPeerSubsetSolver.scala
diff --git a/...natureVerifyingMessageSerialization.scala → ...natureVerifyingMessageSerialization.scala b/...natureVerifyingMessageSerialization.scala → ...natureVerifyingMessageSerialization.scala
diff --git a/...la/lofi_acl/sync/acl/monotonic/Sync.scala → ...la/lofi_acl/sync/acl/monotonic/Sync.scala b/...la/lofi_acl/sync/acl/monotonic/Sync.scala → ...la/lofi_acl/sync/acl/monotonic/Sync.scala
diff --git a/.../acl/monotonic/SyncWithMonotonicAcl.scala → .../acl/monotonic/SyncWithMonotonicAcl.scala b/.../acl/monotonic/SyncWithMonotonicAcl.scala → .../acl/monotonic/SyncWithMonotonicAcl.scala
diff --git a/...cl/sync/no_acl/MutuallyTrustingSync.scala → ...cl/sync/no_acl/MutuallyTrustingSync.scala b/...cl/sync/no_acl/MutuallyTrustingSync.scala → ...cl/sync/no_acl/MutuallyTrustingSync.scala
diff --git a/.../no_acl/MutuallyTrustingSyncMessage.scala → .../no_acl/MutuallyTrustingSyncMessage.scala b/.../no_acl/MutuallyTrustingSyncMessage.scala → .../no_acl/MutuallyTrustingSyncMessage.scala
diff --git a/...fi_acl/transport/P2PTlsTcpConnector.scala → ...fi_acl/transport/P2PTlsTcpConnector.scala b/...fi_acl/transport/P2PTlsTcpConnector.scala → ...fi_acl/transport/P2PTlsTcpConnector.scala
diff --git a/...i_acl/transport/P2PX509TrustManager.scala → ...i_acl/transport/P2PX509TrustManager.scala b/...i_acl/transport/P2PX509TrustManager.scala → ...i_acl/transport/P2PX509TrustManager.scala
diff --git a/...la/lofi_acl/access/DeltaSurgeonTest.scala → ...la/lofi_acl/access/DeltaSurgeonTest.scala b/...la/lofi_acl/access/DeltaSurgeonTest.scala → ...la/lofi_acl/access/DeltaSurgeonTest.scala
diff --git a/...st/scala/lofi_acl/access/FilterTest.scala → ...st/scala/lofi_acl/access/FilterTest.scala b/...st/scala/lofi_acl/access/FilterTest.scala → ...st/scala/lofi_acl/access/FilterTest.scala
diff --git a/...la/lofi_acl/access/KeyHierarchyTest.scala → ...la/lofi_acl/access/KeyHierarchyTest.scala b/...la/lofi_acl/access/KeyHierarchyTest.scala → ...la/lofi_acl/access/KeyHierarchyTest.scala
diff --git a/...access/PermissionTreePropertyChecks.scala → ...access/PermissionTreePropertyChecks.scala b/...access/PermissionTreePropertyChecks.scala → ...access/PermissionTreePropertyChecks.scala
diff --git a/.../lofi_acl/access/PermissionTreeTest.scala → .../lofi_acl/access/PermissionTreeTest.scala b/.../lofi_acl/access/PermissionTreeTest.scala → .../lofi_acl/access/PermissionTreeTest.scala
diff --git a/...test/scala/lofi_acl/access/RuleTest.scala → ...test/scala/lofi_acl/access/RuleTest.scala b/...test/scala/lofi_acl/access/RuleTest.scala → ...test/scala/lofi_acl/access/RuleTest.scala
diff --git a/...scala/lofi_acl/ardt/base/CausalSpec.scala → ...scala/lofi_acl/ardt/base/CausalSpec.scala b/...scala/lofi_acl/ardt/base/CausalSpec.scala → ...scala/lofi_acl/ardt/base/CausalSpec.scala
diff --git a/...lofi_acl/collections/DeltaStoreTest.scala → ...lofi_acl/collections/DeltaStoreTest.scala b/...lofi_acl/collections/DeltaStoreTest.scala → ...lofi_acl/collections/DeltaStoreTest.scala
diff --git a/...ala/lofi_acl/collections/DotMapTest.scala → ...ala/lofi_acl/collections/DotMapTest.scala b/...ala/lofi_acl/collections/DotMapTest.scala → ...ala/lofi_acl/collections/DotMapTest.scala
diff --git a/...l/collections/MutableDeltaStoreTest.scala → ...l/collections/MutableDeltaStoreTest.scala b/...l/collections/MutableDeltaStoreTest.scala → ...l/collections/MutableDeltaStoreTest.scala
diff --git a/...ala/lofi_acl/crypto/Ed25519UtilTest.scala → ...ala/lofi_acl/crypto/Ed25519UtilTest.scala b/...ala/lofi_acl/crypto/Ed25519UtilTest.scala → ...ala/lofi_acl/crypto/Ed25519UtilTest.scala
diff --git a/...est/scala/lofi_acl/crypto/HkdfTests.scala → ...est/scala/lofi_acl/crypto/HkdfTests.scala b/...est/scala/lofi_acl/crypto/HkdfTests.scala → ...est/scala/lofi_acl/crypto/HkdfTests.scala
diff --git a/...ofi_acl/crypto/KeyDerivationKeyTest.scala → ...ofi_acl/crypto/KeyDerivationKeyTest.scala b/...ofi_acl/crypto/KeyDerivationKeyTest.scala → ...ofi_acl/crypto/KeyDerivationKeyTest.scala
diff --git a/...st/scala/lofi_acl/crypto/X25519Test.scala → ...st/scala/lofi_acl/crypto/X25519Test.scala b/...st/scala/lofi_acl/crypto/X25519Test.scala → ...st/scala/lofi_acl/crypto/X25519Test.scala
diff --git a/...cala/lofi_acl/crypto/X509TestHelper.scala → ...cala/lofi_acl/crypto/X509TestHelper.scala b/...cala/lofi_acl/crypto/X509TestHelper.scala → ...cala/lofi_acl/crypto/X509TestHelper.scala
diff --git a/.../scala/lofi_acl/crypto/X509UtilTest.scala → .../scala/lofi_acl/crypto/X509UtilTest.scala b/.../scala/lofi_acl/crypto/X509UtilTest.scala → .../scala/lofi_acl/crypto/X509UtilTest.scala
diff --git a/...lofi_acl/sync/ConnectionManagerTest.scala → ...lofi_acl/sync/ConnectionManagerTest.scala b/...lofi_acl/sync/ConnectionManagerTest.scala → ...lofi_acl/sync/ConnectionManagerTest.scala
diff --git a/...cl/transport/P2PTlsTcpConnectorTest.scala → ...cl/transport/P2PTlsTcpConnectorTest.scala b/...cl/transport/P2PTlsTcpConnectorTest.scala → ...cl/transport/P2PTlsTcpConnectorTest.scala
diff --git a/...l/transport/P2PX509TrustManagerTest.scala → ...l/transport/P2PX509TrustManagerTest.scala b/...l/transport/P2PX509TrustManagerTest.scala → ...l/transport/P2PX509TrustManagerTest.scala
diff --git a/build.sbt b/build.sbt
@@ -14,8 +14,6 @@ lazy val bismuth = project.in(file(".")).settings(scala3defaults).aggregate(
   exampleLenses,
   examplesMiscJVM,
   loCal,
-  lofiAcl,
-  lofiAclExample,
   lore.js,
   lore.jvm,
   loreCompilerPlugin,
@@ -133,7 +131,7 @@ lazy val exampleLenses = project.in(file("Modules/Examples/ReactiveLenses"))
 
 lazy val examplesMiscJVM = project.in(file("Modules/Examples/Misc JVM"))
   .enablePlugins(JmhPlugin)
-  .dependsOn(reactives.jvm, replication.jvm)
+  .dependsOn(reactives.jvm, replication.jvm, deltalens)
   .settings(
     scala3defaults,
     fork := true,
@@ -158,30 +156,6 @@ lazy val loCal = project.in(file("Modules/Examples/Lore Calendar"))
     SettingsLocal.deployTask
   )
 
-lazy val lofiAcl = project.in(file("Modules/Local-first Access Control"))
-  .dependsOn(deltalens, rdts.jvm % "compile->compile;test->test")
-  .settings(
-    scala3defaults,
-    Settings.javaOutputVersion(17),
-    Settings.safeInit(Compile / compile, Test / compile),
-    Dependencies.munit,
-    Dependencies.munitCheck,
-    Dependencies.jsoniterScala,
-    Dependencies.tink,
-    Dependencies.slf4j,
-    Dependencies.bouncyCastle,
-    Test / fork := true,
-  )
-
-lazy val lofiAclExample = project.in(file("Modules/Local-first Access Control/Example"))
-  .dependsOn(lofiAcl)
-  .settings(
-    scala3defaults,
-    libraryDependencies += Dependencies.scalafx,
-    Dependencies.jsoniterScala,
-    Dependencies.munit,
-    publish / skip := true,
-  )
 
 lazy val lore = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("Modules/Lore"))
   .dependsOn(reactives)
@@ -219,7 +193,7 @@ lazy val loreCompilerPluginExamples = project.in(file("Modules/LoRe Compiler Plu
 
 lazy val microbenchmarks = project.in(file("Modules/Microbenchmarks"))
   .enablePlugins(JmhPlugin)
-  .dependsOn(reactives.jvm, rdts.jvm, replication.jvm, lofiAcl)
+  .dependsOn(reactives.jvm, rdts.jvm, replication.jvm)
   .settings(
     scala3defaults,
     Settings.explicitNulls(Compile / compile),
@@ -290,10 +264,13 @@ lazy val replication = crossProject(JVMPlatform, JSPlatform, NativePlatform).in(
     Settings.javaOutputVersion(17),
     Settings.explicitNulls(Compile / compile),
     Settings.safeInit(Compile / compile),
+    SettingsLocal.publishSonatype,
     Dependencies.munitCheck,
     Dependencies.munit,
     Dependencies.jsoniterScala,
-    SettingsLocal.publishSonatype
+  ).jvmSettings(
+    Dependencies.tink,
+    Dependencies.bouncyCastle,
   )
 
 lazy val todolist = project.in(file("Modules/Examples/TodoMVC"))