Skip to content

Commit db648d7

Browse files
authored
Improve licensing language (#10)
Improve language around licensing for most crates to be GPL or Bitwarden SDK License.
1 parent 75ad38e commit db648d7

File tree

28 files changed

+2343
-299
lines changed

28 files changed

+2343
-299
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
resolver = "2"
3-
members = ["crates/*"]
3+
members = ["crates/*", "bitwarden_license/*"]
44

55
# Global settings for all crates should be defined here
66
[workspace.package]
@@ -27,7 +27,7 @@ bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=1.0.0"
2727
bitwarden-fido = { path = "crates/bitwarden-fido", version = "=1.0.0" }
2828
bitwarden-generators = { path = "crates/bitwarden-generators", version = "=1.0.0" }
2929
bitwarden-send = { path = "crates/bitwarden-send", version = "=1.0.0" }
30-
bitwarden-sm = { path = "crates/bitwarden-sm", version = "=1.0.0" }
30+
bitwarden-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
3131
bitwarden-vault = { path = "crates/bitwarden-vault", version = "=1.0.0" }
3232

3333
# External crates that are expected to maintain a consistent version across all crates

LICENSE

Lines changed: 20 additions & 295 deletions
Large diffs are not rendered by default.

LICENSE_GPL.txt

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE_SDK.txt

Lines changed: 295 additions & 0 deletions
Large diffs are not rendered by default.

crates/bitwarden-sm/Cargo.toml renamed to bitwarden_license/bitwarden-sm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition.workspace = true
1010
rust-version.workspace = true
1111
homepage.workspace = true
1212
repository.workspace = true
13-
license-file.workspace = true
13+
license-file = "../../LICENSE_SDK.txt"
1414
keywords.workspace = true
1515

1616
[dependencies]

languages/js/sdk-internal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@bitwarden/sdk-internal",
33
"version": "0.1.0",
4-
"license": "SEE LICENSE IN LICENSE",
4+
"license": "GPL-3.0",
55
"files": [
66
"bitwarden_wasm_internal_bg.js",
77
"bitwarden_wasm_internal_bg.wasm",

languages/kotlin/sdk/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ android {
2222
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2323
}
2424
}
25+
2526
compileOptions {
2627
sourceCompatibility JavaVersion.VERSION_1_8
2728
targetCompatibility JavaVersion.VERSION_1_8
2829
}
30+
2931
kotlinOptions {
3032
jvmTarget = '1.8'
3133
}

languages/kotlin/sdk/src/main/resources/META-INF/LICENSE_GPL.txt

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

languages/swift/LICENSE_GPL.txt

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)