Skip to content

Commit

Permalink
Merge pull request #1 from element-hq/bma/agpl
Browse files Browse the repository at this point in the history
Change licence from Apache 2.0 to AGPL-3.0
  • Loading branch information
bmarty authored Sep 25, 2024
2 parents c6ff119 + 8f83c69 commit b9fe58b
Show file tree
Hide file tree
Showing 280 changed files with 2,142 additions and 3,340 deletions.
836 changes: 660 additions & 176 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ Rust bindings like those generated here, see

## License

[Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0)
[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.txt)
2 changes: 1 addition & 1 deletion bindings/wysiwyg-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = "https://gitlab.com/andybalaam/wysiwyg-rust"
repository = "https://gitlab.com/andybalaam/wysiwyg-rust"
description = "Swift and Kotlin bindings for wysiwyg-rust"
keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
license = "Apache-2.0"
license = "AGPL-3.0"
name = "uniffi-wysiwyg-composer"
version = "2.37.9"
rust-version = { workspace = true }
Expand Down
14 changes: 3 additions & 11 deletions bindings/wysiwyg-ffi/src/ffi_dom_creation_error.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2023 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

use std::{error::Error, fmt::Display};

Expand Down
14 changes: 3 additions & 11 deletions bindings/wysiwyg-ffi/src/ffi_menu_action.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2023 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

use crate::SuggestionPattern;

Expand Down
14 changes: 3 additions & 11 deletions bindings/wysiwyg-ffi/src/ffi_pattern_key.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2023 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

#[derive(Debug, PartialEq, Eq, uniffi::Enum)]
pub enum PatternKey {
Expand Down
14 changes: 3 additions & 11 deletions bindings/wysiwyg-ffi/src/ffi_suggestion_pattern.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2023 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

use crate::PatternKey;

Expand Down
14 changes: 3 additions & 11 deletions bindings/wysiwyg-ffi/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2022 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

uniffi_macros::include_scaffolding!("wysiwyg_composer");

Expand Down
15 changes: 4 additions & 11 deletions bindings/wysiwyg-ffi/src/wysiwyg_composer.udl
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
// Copyright 2022 The Matrix.org Foundation C.I.C.
// Copyright 2024 New Vector Ltd.
// Copyright 2022 The Matrix.org Foundation C.I.C
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

namespace wysiwyg_composer {};
2 changes: 1 addition & 1 deletion bindings/wysiwyg-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = "https://gitlab.com/andybalaam/wysiwyg-rust"
repository = "https://gitlab.com/andybalaam/wysiwyg-rust"
description = "WASM bindings for wysiwyg-rust"
keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
license = "Apache-2.0"
license = "AGPL-3.0"
name = "wysiwyg-wasm"
version = "2.37.9"
rust-version = { workspace = true }
Expand Down
Loading

0 comments on commit b9fe58b

Please sign in to comment.