Improve licensing language (#10)

Improve language around licensing for most crates to be GPL or Bitwarden SDK License.
bitwarden · Oct 24, 2024 · db648d7 · db648d7
1 parent 75ad38e
commit db648d7
Show file tree

Hide file tree

Showing 28 changed files with 2,343 additions and 299 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["crates/*"]
+members = ["crates/*", "bitwarden_license/*"]
 
 # Global settings for all crates should be defined here
 [workspace.package]
@@ -27,7 +27,7 @@ bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=1.0.0"
 bitwarden-fido = { path = "crates/bitwarden-fido", version = "=1.0.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=1.0.0" }
 bitwarden-send = { path = "crates/bitwarden-send", version = "=1.0.0" }
-bitwarden-sm = { path = "crates/bitwarden-sm", version = "=1.0.0" }
+bitwarden-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
 bitwarden-vault = { path = "crates/bitwarden-vault", version = "=1.0.0" }
 
 # External crates that are expected to maintain a consistent version across all crates

diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE_GPL.txt b/LICENSE_GPL.txt
diff --git a/LICENSE_SDK.txt b/LICENSE_SDK.txt
diff --git a/crates/bitwarden-sm/Cargo.toml → bitwarden_license/bitwarden-sm/Cargo.toml b/crates/bitwarden-sm/Cargo.toml → bitwarden_license/bitwarden-sm/Cargo.toml
@@ -10,7 +10,7 @@ edition.workspace = true
 rust-version.workspace = true
 homepage.workspace = true
 repository.workspace = true
-license-file.workspace = true
+license-file = "../../LICENSE_SDK.txt"
 keywords.workspace = true
 
 [dependencies]

diff --git a/crates/bitwarden-sm/src/client_projects.rs → ...cense/bitwarden-sm/src/client_projects.rs b/crates/bitwarden-sm/src/client_projects.rs → ...cense/bitwarden-sm/src/client_projects.rs
diff --git a/crates/bitwarden-sm/src/client_secrets.rs → ...icense/bitwarden-sm/src/client_secrets.rs b/crates/bitwarden-sm/src/client_secrets.rs → ...icense/bitwarden-sm/src/client_secrets.rs
diff --git a/crates/bitwarden-sm/src/lib.rs → bitwarden_license/bitwarden-sm/src/lib.rs b/crates/bitwarden-sm/src/lib.rs → bitwarden_license/bitwarden-sm/src/lib.rs
diff --git a/crates/bitwarden-sm/src/projects/create.rs → ...cense/bitwarden-sm/src/projects/create.rs b/crates/bitwarden-sm/src/projects/create.rs → ...cense/bitwarden-sm/src/projects/create.rs
diff --git a/crates/bitwarden-sm/src/projects/delete.rs → ...cense/bitwarden-sm/src/projects/delete.rs b/crates/bitwarden-sm/src/projects/delete.rs → ...cense/bitwarden-sm/src/projects/delete.rs
diff --git a/crates/bitwarden-sm/src/projects/get.rs → ..._license/bitwarden-sm/src/projects/get.rs b/crates/bitwarden-sm/src/projects/get.rs → ..._license/bitwarden-sm/src/projects/get.rs
diff --git a/crates/bitwarden-sm/src/projects/list.rs → ...license/bitwarden-sm/src/projects/list.rs b/crates/bitwarden-sm/src/projects/list.rs → ...license/bitwarden-sm/src/projects/list.rs
diff --git a/crates/bitwarden-sm/src/projects/mod.rs → ..._license/bitwarden-sm/src/projects/mod.rs b/crates/bitwarden-sm/src/projects/mod.rs → ..._license/bitwarden-sm/src/projects/mod.rs
diff --git a/...arden-sm/src/projects/project_response.rs → ...arden-sm/src/projects/project_response.rs b/...arden-sm/src/projects/project_response.rs → ...arden-sm/src/projects/project_response.rs
diff --git a/crates/bitwarden-sm/src/projects/update.rs → ...cense/bitwarden-sm/src/projects/update.rs b/crates/bitwarden-sm/src/projects/update.rs → ...cense/bitwarden-sm/src/projects/update.rs
diff --git a/crates/bitwarden-sm/src/secrets/create.rs → ...icense/bitwarden-sm/src/secrets/create.rs b/crates/bitwarden-sm/src/secrets/create.rs → ...icense/bitwarden-sm/src/secrets/create.rs
diff --git a/crates/bitwarden-sm/src/secrets/delete.rs → ...icense/bitwarden-sm/src/secrets/delete.rs b/crates/bitwarden-sm/src/secrets/delete.rs → ...icense/bitwarden-sm/src/secrets/delete.rs
diff --git a/crates/bitwarden-sm/src/secrets/get.rs → ...n_license/bitwarden-sm/src/secrets/get.rs b/crates/bitwarden-sm/src/secrets/get.rs → ...n_license/bitwarden-sm/src/secrets/get.rs
diff --git a/...es/bitwarden-sm/src/secrets/get_by_ids.rs → ...se/bitwarden-sm/src/secrets/get_by_ids.rs b/...es/bitwarden-sm/src/secrets/get_by_ids.rs → ...se/bitwarden-sm/src/secrets/get_by_ids.rs
diff --git a/crates/bitwarden-sm/src/secrets/list.rs → ..._license/bitwarden-sm/src/secrets/list.rs b/crates/bitwarden-sm/src/secrets/list.rs → ..._license/bitwarden-sm/src/secrets/list.rs
diff --git a/crates/bitwarden-sm/src/secrets/mod.rs → ...n_license/bitwarden-sm/src/secrets/mod.rs b/crates/bitwarden-sm/src/secrets/mod.rs → ...n_license/bitwarden-sm/src/secrets/mod.rs
diff --git a/...twarden-sm/src/secrets/secret_response.rs → ...twarden-sm/src/secrets/secret_response.rs b/...twarden-sm/src/secrets/secret_response.rs → ...twarden-sm/src/secrets/secret_response.rs
diff --git a/crates/bitwarden-sm/src/secrets/sync.rs → ..._license/bitwarden-sm/src/secrets/sync.rs b/crates/bitwarden-sm/src/secrets/sync.rs → ..._license/bitwarden-sm/src/secrets/sync.rs
diff --git a/crates/bitwarden-sm/src/secrets/update.rs → ...icense/bitwarden-sm/src/secrets/update.rs b/crates/bitwarden-sm/src/secrets/update.rs → ...icense/bitwarden-sm/src/secrets/update.rs
diff --git a/languages/js/sdk-internal/package.json b/languages/js/sdk-internal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/sdk-internal",
   "version": "0.1.0",
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "GPL-3.0",
   "files": [
     "bitwarden_wasm_internal_bg.js",
     "bitwarden_wasm_internal_bg.wasm",

diff --git a/languages/kotlin/sdk/build.gradle b/languages/kotlin/sdk/build.gradle
@@ -22,10 +22,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }

diff --git a/languages/kotlin/sdk/src/main/resources/META-INF/LICENSE_GPL.txt b/languages/kotlin/sdk/src/main/resources/META-INF/LICENSE_GPL.txt
diff --git a/languages/swift/LICENSE_GPL.txt b/languages/swift/LICENSE_GPL.txt