diff --git a/build.gradle.kts b/build.gradle.kts index a798ee68ea..4d61f85907 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,7 @@ version = "3" val internalLeafProjects = listOf( project(":foundation-support"), + project(":foundation-store"), project(":foundation-store-contracts"), project(":foundation-crypto-keys"), project(":foundation-config"), @@ -37,6 +38,7 @@ val internalLeafMainClassDirs = dependencies { // implementation implementation(project(":foundation-support")) + implementation(project(":foundation-store")) implementation(project(":foundation-store-contracts")) implementation(project(":foundation-crypto-keys")) implementation(project(":foundation-config")) diff --git a/foundation-store-contracts/gradle/owned-output-patterns.txt b/foundation-store-contracts/gradle/owned-output-patterns.txt index 78d129a0bb..357f80163b 100644 --- a/foundation-store-contracts/gradle/owned-output-patterns.txt +++ b/foundation-store-contracts/gradle/owned-output-patterns.txt @@ -3,5 +3,6 @@ network/crypta/store/StorableBlock* network/crypta/store/BlockMetadata* network/crypta/store/GetPubkey* +network/crypta/store/alerts/** network/crypta/node/stats/StoreAccessStats* network/crypta/node/stats/StatsNotAvailableException* diff --git a/foundation-store/build.gradle.kts b/foundation-store/build.gradle.kts new file mode 100644 index 0000000000..dc51d81762 --- /dev/null +++ b/foundation-store/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("cryptad.java-kotlin-conventions") + id("cryptad.spotless") + `java-library` +} + +version = rootProject.version + +dependencies { + api(project(":foundation-support")) + api(project(":foundation-store-contracts")) + api(project(":foundation-crypto-keys")) + + implementation(project(":thirdparty-onion")) + implementation(libs.slf4jApi) + implementation(files(rootProject.file("libs/wrapper.jar"))) + + compileOnly(libs.jetbrainsAnnotations) +} diff --git a/foundation-store/gradle/owned-output-patterns.txt b/foundation-store/gradle/owned-output-patterns.txt new file mode 100644 index 0000000000..61288df909 --- /dev/null +++ b/foundation-store/gradle/owned-output-patterns.txt @@ -0,0 +1,17 @@ +# Aggregated main outputs that must be pruned on non-clean builds because :foundation-store owns them now. + +network/crypta/store/CHKStore* +network/crypta/store/FetchOptions* +network/crypta/store/FreenetStore* +network/crypta/store/KeyCollisionException* +network/crypta/store/NullFreenetStore* +network/crypta/store/ProxyFreenetStore* +network/crypta/store/PubkeyStore* +network/crypta/store/RAMFreenetStore* +network/crypta/store/SSKStore* +network/crypta/store/SimpleGetPubkey* +network/crypta/store/SlashdotStore* +network/crypta/store/StoreCallback* +network/crypta/store/package-info* +network/crypta/store/caching/** +network/crypta/store/saltedhash/** diff --git a/src/main/java/network/crypta/store/CHKStore.java b/foundation-store/src/main/java/network/crypta/store/CHKStore.java similarity index 100% rename from src/main/java/network/crypta/store/CHKStore.java rename to foundation-store/src/main/java/network/crypta/store/CHKStore.java diff --git a/src/main/java/network/crypta/store/FetchOptions.java b/foundation-store/src/main/java/network/crypta/store/FetchOptions.java similarity index 100% rename from src/main/java/network/crypta/store/FetchOptions.java rename to foundation-store/src/main/java/network/crypta/store/FetchOptions.java diff --git a/src/main/java/network/crypta/store/FreenetStore.java b/foundation-store/src/main/java/network/crypta/store/FreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/FreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/FreenetStore.java diff --git a/src/main/java/network/crypta/store/KeyCollisionException.java b/foundation-store/src/main/java/network/crypta/store/KeyCollisionException.java similarity index 100% rename from src/main/java/network/crypta/store/KeyCollisionException.java rename to foundation-store/src/main/java/network/crypta/store/KeyCollisionException.java diff --git a/src/main/java/network/crypta/store/NullFreenetStore.java b/foundation-store/src/main/java/network/crypta/store/NullFreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/NullFreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/NullFreenetStore.java diff --git a/src/main/java/network/crypta/store/ProxyFreenetStore.java b/foundation-store/src/main/java/network/crypta/store/ProxyFreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/ProxyFreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/ProxyFreenetStore.java diff --git a/src/main/java/network/crypta/store/PubkeyStore.java b/foundation-store/src/main/java/network/crypta/store/PubkeyStore.java similarity index 100% rename from src/main/java/network/crypta/store/PubkeyStore.java rename to foundation-store/src/main/java/network/crypta/store/PubkeyStore.java diff --git a/src/main/java/network/crypta/store/RAMFreenetStore.java b/foundation-store/src/main/java/network/crypta/store/RAMFreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/RAMFreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/RAMFreenetStore.java diff --git a/src/main/java/network/crypta/store/SSKStore.java b/foundation-store/src/main/java/network/crypta/store/SSKStore.java similarity index 100% rename from src/main/java/network/crypta/store/SSKStore.java rename to foundation-store/src/main/java/network/crypta/store/SSKStore.java diff --git a/src/main/java/network/crypta/store/SimpleGetPubkey.java b/foundation-store/src/main/java/network/crypta/store/SimpleGetPubkey.java similarity index 100% rename from src/main/java/network/crypta/store/SimpleGetPubkey.java rename to foundation-store/src/main/java/network/crypta/store/SimpleGetPubkey.java diff --git a/src/main/java/network/crypta/store/SlashdotStore.java b/foundation-store/src/main/java/network/crypta/store/SlashdotStore.java similarity index 100% rename from src/main/java/network/crypta/store/SlashdotStore.java rename to foundation-store/src/main/java/network/crypta/store/SlashdotStore.java diff --git a/src/main/java/network/crypta/store/StoreCallback.java b/foundation-store/src/main/java/network/crypta/store/StoreCallback.java similarity index 100% rename from src/main/java/network/crypta/store/StoreCallback.java rename to foundation-store/src/main/java/network/crypta/store/StoreCallback.java diff --git a/src/main/java/network/crypta/store/caching/CachingFreenetStore.java b/foundation-store/src/main/java/network/crypta/store/caching/CachingFreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/caching/CachingFreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/caching/CachingFreenetStore.java diff --git a/src/main/java/network/crypta/store/caching/CachingFreenetStoreTracker.java b/foundation-store/src/main/java/network/crypta/store/caching/CachingFreenetStoreTracker.java similarity index 100% rename from src/main/java/network/crypta/store/caching/CachingFreenetStoreTracker.java rename to foundation-store/src/main/java/network/crypta/store/caching/CachingFreenetStoreTracker.java diff --git a/src/main/java/network/crypta/store/package-info.java b/foundation-store/src/main/java/network/crypta/store/package-info.java similarity index 100% rename from src/main/java/network/crypta/store/package-info.java rename to foundation-store/src/main/java/network/crypta/store/package-info.java diff --git a/src/main/java/network/crypta/store/saltedhash/CipherManager.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/CipherManager.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/CipherManager.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/CipherManager.java diff --git a/src/main/java/network/crypta/store/saltedhash/LockManager.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/LockManager.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/LockManager.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/LockManager.java diff --git a/src/main/java/network/crypta/store/saltedhash/ResizablePersistentIntBuffer.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/ResizablePersistentIntBuffer.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/ResizablePersistentIntBuffer.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/ResizablePersistentIntBuffer.java diff --git a/src/main/java/network/crypta/store/saltedhash/SaltedHashFreenetStore.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashFreenetStore.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/SaltedHashFreenetStore.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashFreenetStore.java diff --git a/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreDependencies.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreDependencies.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/SaltedHashStoreDependencies.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreDependencies.java diff --git a/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreLocation.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreLocation.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/SaltedHashStoreLocation.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreLocation.java diff --git a/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreParams.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreParams.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/SaltedHashStoreParams.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreParams.java diff --git a/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreSizing.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreSizing.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/SaltedHashStoreSizing.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/SaltedHashStoreSizing.java diff --git a/src/main/java/network/crypta/store/saltedhash/package-info.java b/foundation-store/src/main/java/network/crypta/store/saltedhash/package-info.java similarity index 100% rename from src/main/java/network/crypta/store/saltedhash/package-info.java rename to foundation-store/src/main/java/network/crypta/store/saltedhash/package-info.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 3ffa4a37ab..c7dd834c58 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,7 @@ rootProject.name = "cryptad" include( ":foundation-support", + ":foundation-store", ":foundation-store-contracts", ":foundation-crypto-keys", ":foundation-config",