ProjectLibertyLabs · aramikm · Aug 23, 2024 · Aug 22, 2024 · Aug 22, 2024 · Aug 22, 2024
diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
@@ -220,46 +220,47 @@ jobs:
       - name: Build Node Bridge
         run: make test-node
 
-  test_java_lib_gradle:
-    name: Test Java Library
-    runs-on: ubuntu-latest
-    needs: [verify, test, lint, build, build_gradlew_jvm]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Java
-        uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-      - name: Test Java Library
-        working-directory: java/example-graphsdk-client
-        run: ./gradlew test
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_ACTOR: ${{ github.actor }}
-
-  test_published_npm:
-    name: Test Published NPM Package
-    runs-on: ubuntu-latest
-    needs: [verify, test, lint, build, build_gradlew_jvm]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18.x'
-          registry-url: https://registry.npmjs.org/
-      - name: Install NPM Dependencies
-        working-directory: bridge/node/node-example-client
-        run: npm install
-      - name: Test Published NPM Package
-        working-directory: bridge/node/node-example-client
-        run: npm run test
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+# Uncomment after first deployment
+  # test_java_lib_gradle:
+  #   name: Test Java Library
+  #   runs-on: ubuntu-latest
+  #   needs: [verify, test, lint, build, build_gradlew_jvm]
+  #   permissions:
+  #     contents: read
+  #     packages: write
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Set up Java
+  #       uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
+  #       with:
+  #         java-version: '17'
+  #         distribution: 'adopt'
+  #     - name: Test Java Library
+  #       working-directory: java/example-graphsdk-client
+  #       run: ./gradlew test
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #         GITHUB_ACTOR: ${{ github.actor }}
+  # 
+  # test_published_npm:
+  #   name: Test Published NPM Package
+  #   runs-on: ubuntu-latest
+  #   needs: [verify, test, lint, build, build_gradlew_jvm]
+  #   permissions:
+  #     contents: read
+  #     packages: write
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Set up Node
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: '18.x'
+  #         registry-url: https://registry.npmjs.org/
+  #     - name: Install NPM Dependencies
+  #       working-directory: bridge/node/node-example-client
+  #       run: npm install
+  #     - name: Test Published NPM Package
+  #       working-directory: bridge/node/node-example-client
+  #       run: npm run test
+  #       env:
+  #         NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -274,14 +274,14 @@ jobs:
         if: env.TEST_RUN != 'true'
         run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 
       - name: Dry run NPM Package
         working-directory: bridge/node
         if: env.TEST_RUN == 'true'
         run: npm publish --access public --dry-run
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 
   generate-docs:
     name: Generate graph sdk rust docs

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright Project Liberty LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ UNAME := $(shell uname)
 
 PROTOC := protoc
  ifeq ($(UNAME), Darwin)
-	PROTOC = /opt/homebrew/opt/protobuf@27/bin/protoc
+	PROTOC = /opt/homebrew/opt/protobuf@21/bin/protoc
 endif
 
 CBINDGEN=${HOME}/.cargo/bin/cbindgen
@@ -159,7 +159,7 @@ install-protobuf-codegen:
 ifeq ($(UNAME), Darwin)
 install-protos: install-protobuf-codegen
 	@echo "Installing protobuf package..."
-	@brew install protobuf@27
+	@brew install protobuf@21
 endif
 ifeq ($(UNAME), Linux)
 install-protos: install-protobuf-codegen
@@ -178,5 +178,5 @@ build-rust-protos:
 .PHONY: build-java-protos
 build-java-protos:
 	@echo "Generating Java protobuf types..."
-	@rm -f ./java/lib/src/main/java/io/amplica/graphsdk/models/*
+	@rm -f ./java/lib/src/main/java/io/projectliberty/graphsdk/models/*
 	@$(PROTOC) --java_out ./java/lib/src/main/java/ ./bridge/common/protos/input.proto ./bridge/common/protos/output.proto
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ Here are a few examples of how to use this library:
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 
-[issues-shield]: https://img.shields.io/github/issues/LibertyDSNP/graph-sdk.svg?style=for-the-badge
-[issues-url]: https://github.com/LibertyDSNP/graph-sdk/issues
-[release-shield]: https://img.shields.io/github/v/release/LibertyDSNP/graph-sdk?style=for-the-badge
-[release-url]: https://github.com/LibertyDSNP/graph-sdk/releases
+[issues-shield]: https://img.shields.io/github/issues/ProjectLibertyLabs/graph-sdk.svg?style=for-the-badge
+[issues-url]: https://github.com/ProjectLibertyLabs/graph-sdk/issues
+[release-shield]: https://img.shields.io/github/v/release/ProjectLibertyLabs/graph-sdk?style=for-the-badge
+[release-url]: https://github.com/ProjectLibertyLabs/graph-sdk/releases
diff --git a/bridge/common/Cargo.toml b/bridge/common/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "dsnp-graph-sdk-common"
-version = "1.1.4"
+version = "2.0.0"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.4", path = "../../core" }
-dsnp-graph-config = { version = "1.1.4", path = "../../config" }
+dsnp-graph-core = { version = "2.0.0", path = "../../core" }
+dsnp-graph-config = { version = "2.0.0", path = "../../config" }
 libc = "0.2.155"
 protobuf = { version = "3.5.0", features = ["with-bytes"] }
diff --git a/bridge/common/protos/input.proto b/bridge/common/protos/input.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option java_package = "io.amplica.graphsdk.models";
+option java_package = "io.projectliberty.graphsdk.models";
 option java_multiple_files = true;
 
 enum GraphKeyType {

diff --git a/bridge/common/protos/output.proto b/bridge/common/protos/output.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option java_package = "io.amplica.graphsdk.models";
+option java_package = "io.projectliberty.graphsdk.models";
 option java_multiple_files = true;
 
 enum PrivacyType {

diff --git a/bridge/common/src/proto_types/input.rs b/bridge/common/src/proto_types/input.rs
@@ -9,6 +9,7 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
+#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -2294,10 +2295,10 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x0b.ConnectionR\nconnection\x1a`\n\x0bAddGraphKey\x12+\n\x12owner_dsnp_\
     user_id\x18\x01\x20\x01(\x04R\x0fownerDsnpUserId\x12$\n\x0enew_public_ke\
     y\x18\x02\x20\x01(\x0cR\x0cnewPublicKeyB\x07\n\x05innerB\n\n\x08_options\
-    *\x1a\n\x0cGraphKeyType\x12\n\n\x06X25519\x10\0B\x1e\n\x1aio.amplica.gra\
-    phsdk.modelsP\x01J\xd9\x15\n\x06\x12\x04\0\0R\x01\n\x08\n\x01\x0c\x12\
-    \x03\0\0\x12\n\x08\n\x01\x08\x12\x03\x02\03\n\t\n\x02\x08\x01\x12\x03\
-    \x02\03\n\x08\n\x01\x08\x12\x03\x03\0\"\n\t\n\x02\x08\n\x12\x03\x03\0\"\
+    *\x1a\n\x0cGraphKeyType\x12\n\n\x06X25519\x10\0B%\n!io.projectliberty.gr\
+    aphsdk.modelsP\x01J\xd9\x15\n\x06\x12\x04\0\0R\x01\n\x08\n\x01\x0c\x12\
+    \x03\0\0\x12\n\x08\n\x01\x08\x12\x03\x02\0:\n\t\n\x02\x08\x01\x12\x03\
+    \x02\0:\n\x08\n\x01\x08\x12\x03\x03\0\"\n\t\n\x02\x08\n\x12\x03\x03\0\"\
     \n\n\n\x02\x05\0\x12\x04\x05\0\x07\x01\n\n\n\x03\x05\0\x01\x12\x03\x05\
     \x05\x11\n\x0b\n\x04\x05\0\x02\0\x12\x03\x06\x02\r\n\x0c\n\x05\x05\0\x02\
     \0\x01\x12\x03\x06\x02\x08\n\x0c\n\x05\x05\0\x02\0\x02\x12\x03\x06\x0b\

diff --git a/bridge/common/src/proto_types/output.rs b/bridge/common/src/proto_types/output.rs
@@ -9,6 +9,7 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
+#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -2511,10 +2512,10 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x10\x01\x12\x14\n\x10FriendshipPublic\x10\x02\x12\x15\n\x11FriendshipPr\
     ivate\x10\x03*\x1d\n\x0bDsnpVersion\x12\x0e\n\nVersion1_0\x10\0*E\n\x0fE\
     nvironmentType\x12\x0b\n\x07MainNet\x10\0\x12\x10\n\x0cTestnetPaseo\x10\
-    \x01\x12\n\n\x06Rococo\x10\x02\x12\x07\n\x03Dev\x10\x03B\x1e\n\x1aio.amp\
-    lica.graphsdk.modelsP\x01J\xf5\x18\n\x06\x12\x04\0\0c\x01\n\x08\n\x01\
-    \x0c\x12\x03\0\0\x12\n\x08\n\x01\x08\x12\x03\x02\03\n\t\n\x02\x08\x01\
-    \x12\x03\x02\03\n\x08\n\x01\x08\x12\x03\x03\0\"\n\t\n\x02\x08\n\x12\x03\
+    \x01\x12\n\n\x06Rococo\x10\x02\x12\x07\n\x03Dev\x10\x03B%\n!io.projectli\
+    berty.graphsdk.modelsP\x01J\xf5\x18\n\x06\x12\x04\0\0c\x01\n\x08\n\x01\
+    \x0c\x12\x03\0\0\x12\n\x08\n\x01\x08\x12\x03\x02\0:\n\t\n\x02\x08\x01\
+    \x12\x03\x02\0:\n\x08\n\x01\x08\x12\x03\x03\0\"\n\t\n\x02\x08\n\x12\x03\
     \x03\0\"\n\n\n\x02\x05\0\x12\x04\x05\0\x08\x01\n\n\n\x03\x05\0\x01\x12\
     \x03\x05\x05\x10\n\x0b\n\x04\x05\0\x02\0\x12\x03\x06\x04\x0f\n\x0c\n\x05\
     \x05\0\x02\0\x01\x12\x03\x06\x04\n\n\x0c\n\x05\x05\0\x02\0\x02\x12\x03\

diff --git a/bridge/ffi/Cargo.toml b/bridge/ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsnp-graph-sdk-ffi"
-version = "1.1.4"
+version = "2.0.0"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -10,8 +10,8 @@ name = "dsnp_graph_sdk_ffi"
 crate-type = ["staticlib"]
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.4", path = "../../core" }
-dsnp-graph-config = { version = "1.1.4", path = "../../config" }
+dsnp-graph-core = { version = "2.0.0", path = "../../core" }
+dsnp-graph-config = { version = "2.0.0", path = "../../config" }
 libc = "0.2.155"
 lazy_static = "1.5.0"
 anyhow = "1.0.86"
diff --git a/bridge/jni/Cargo.toml b/bridge/jni/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsnp-graph-sdk-jni"
-version = "1.1.4"
+version = "2.0.0"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -10,9 +10,9 @@ name = "dsnp_graph_sdk_jni"
 crate-type = ["cdylib"]
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.4", path = "../../core" }
-dsnp-graph-config = { version = "1.1.4", path = "../../config" }
-dsnp-graph-sdk-common = { version = "1.1.4", path = "../common" }
+dsnp-graph-core = { version = "2.0.0", path = "../../core" }
+dsnp-graph-config = { version = "2.0.0", path = "../../config" }
+dsnp-graph-sdk-common = { version = "2.0.0", path = "../common" }
 jni = "0.21.1"
 cfg-if = "1.0.0"
 log = { version = "^0.4.22", features = ["std", "max_level_debug", "release_max_level_debug"] }