Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(BREAKING) Update core to latest revision #66

Merged
merged 12 commits into from
Dec 17, 2024
Merged
7 changes: 5 additions & 2 deletions .github/workflows/build-kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
with:
version: "${{ env.PROTOC_VERSION }}"

- name: Rust setup (1.70.0)
uses: dtolnay/rust-toolchain@1.70.0
- name: Rust setup (1.71.1)
uses: dtolnay/rust-toolchain@1.71.1
with:
components: rustfmt, clippy

Expand All @@ -48,3 +48,6 @@ jobs:

- name: Lint code
run: cargo clippy --all -- -D warnings

- name: Test code
run: cargo test
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
run: yes | sdkmanager "ndk;${{ env.NDK_VERSION }}" >/dev/null

# use MSRV
- name: Set Rust version to MSRV 1.70
uses: dtolnay/rust-toolchain@1.70
- name: Set Rust version to MSRV 1.71.1
uses: dtolnay/rust-toolchain@1.71.1
with:
# Add armv7, aarch64, i686, x86_64 targets
targets: armv7-linux-androideabi, aarch64-linux-android, i686-linux-android, x86_64-linux-android
Expand Down
115 changes: 63 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ stremio-core-web = { version = "0.47", git = "https://github.com/Stremio/stremio
stremio-core-protobuf = { version = "0.1", path = "stremio-core-protobuf", default-features = false }

# Protobuf
prost = "0.12"
prost-types = "0.12"
prost = "0.13"
prost-types = "0.13"

# Protobuf for codegen, e.g. build.rs
prost-build = "0.12"
protox = "0.5"
# Enable the `cleanup-markdown` feature to clean any non-rust markdown examples
prost-build = { version = "0.13", features = ["cleanup-markdown"] }
protox = "0.7"
glob = "0.3.0"

# Http Request handling
Expand Down
2 changes: 1 addition & 1 deletion stremio-core-kotlin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.4.2"
authors = ["Smart Code OOD"]
edition = "2021"

rust-version = "1.70.0"
rust-version = "1.71.1"

[features]
default = ["kotlin"]
Expand Down
4 changes: 3 additions & 1 deletion stremio-core-kotlin/src/commonMain/rust/model/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use stremio_core::{
types::{
api::LinkAuthKey, events::DismissedEventsBucket, library::LibraryBucket,
notifications::NotificationsBucket, profile::Profile, resource::MetaItemPreview,
search_history::SearchHistoryBucket, streams::StreamsBucket,
search_history::SearchHistoryBucket, server_urls::ServerUrlsBucket, streams::StreamsBucket,
},
Model,
};
Expand Down Expand Up @@ -56,6 +56,7 @@ impl AndroidModel {
profile: Profile,
library: LibraryBucket,
streams: StreamsBucket,
server_urls: ServerUrlsBucket,
notifications: NotificationsBucket,
search_history: SearchHistoryBucket,
dismissed_events: DismissedEventsBucket,
Expand All @@ -79,6 +80,7 @@ impl AndroidModel {
profile,
library,
streams,
server_urls,
notifications,
search_history,
dismissed_events,
Expand Down
Loading
Loading