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

Feat: Improve imports and exports #48

Merged
merged 52 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c37f31b
chore(stremio-core-android): update time dep. and introduce `kotlin` …
elpiel Aug 1, 2024
51c604a
feat(stremio-core-protobuf): move proto files and codegen there and r…
elpiel Aug 1, 2024
ba59b4b
chore: add workspace deps for stremio-* crates
elpiel Aug 2, 2024
8d8a601
chore: rustfmt & clippy fixes + suppress missing safety docs for stre…
elpiel Aug 2, 2024
7264ed9
chore(Cargo.toml): add prost and relative crates to workspace depende…
elpiel Aug 2, 2024
641a7da
fix(stremio-core-protobuf): build.rs - use CARGO_MANIFEST_DIR for pro…
elpiel Aug 2, 2024
40ed286
fix: proto - Descriptor renamed to Descriptor__ because of protoc com…
elpiel Aug 5, 2024
b91e04e
feat(stremio-core-protobuf): move and generalize the bridge and model…
elpiel Aug 6, 2024
757f260
chore: bridge- move ToProtobuf and FromProtobuf traits
elpiel Aug 14, 2024
daff13a
chore(fetch): Refactor to use async/await and remove `either` dep.
elpiel Aug 14, 2024
45c462f
feat(protobuf): add stremio-core-web dep. for mode (de)serialization
elpiel Aug 14, 2024
409a419
feat(AndroidModelField): Impl From / Into Field
elpiel Aug 14, 2024
a711963
chore: Update stremio-core & stremio-core-web rev.
elpiel Aug 14, 2024
bc5fda3
chore: rustfmt & clippy
elpiel Aug 14, 2024
34bab4c
fix(stremio-core-protobuf): build script creates protobuf folder if i…
elpiel Aug 15, 2024
4d7d4b7
fix(ci): build - add protoc setup because of stremio-core-csharp
elpiel Aug 16, 2024
260c524
chore(Cargo): add workspace deps for the `fetch` impl
elpiel Aug 19, 2024
8068ee7
chore(android): AndroidModel should be enabled only by the env. impl …
elpiel Aug 23, 2024
a57079a
chore(stremio-core-protobuf): RuntimeEvent - remove the need of Clone…
elpiel Aug 26, 2024
924ac1a
fix: clippy warnings and cleanup code for bridge action
elpiel Aug 29, 2024
b047db3
chore(stremio-core-android): Use protobuf crate
elpiel Aug 29, 2024
87ed5f3
ci: improve build by setting concurrency and protoc version + add dep…
elpiel Aug 29, 2024
cf337c5
feat(protobuf): field - add missing fields
elpiel Sep 12, 2024
0b1f3cc
fix: add missing model fields for android
elpiel Sep 13, 2024
f045bd5
feat(protobuf): add CatalogWithFiltersAll action for load in Board
elpiel Sep 16, 2024
8636383
feat: Discovery (CatalogsWithExtraAll) & Search (CatalogsWithExtra)
elpiel Sep 17, 2024
aa87467
chore: use once_cell instead of lazy_static
elpiel Sep 30, 2024
946586e
chore: bump core rev
elpiel Sep 30, 2024
31bfd9b
fix: import
elpiel Oct 1, 2024
9758f3b
chore: use stremio-core development branch and comment stremio-core-web
elpiel Oct 1, 2024
b6a333f
chore(stremio-core-android): remove stremio-core-web as dependency fo…
elpiel Oct 2, 2024
6c5fa97
fix: remove duplicates for Vec<MetaItemPreview>
elpiel Oct 8, 2024
7d4ec38
chore: Bump msrv to 1.70
elpiel Oct 8, 2024
27d72c3
fix: clippy
elpiel Oct 8, 2024
b76df1b
chore: tweak workspace dependencies
elpiel Oct 10, 2024
710cc4d
feat(ci): build & release - optimize workflows
elpiel Oct 15, 2024
72bbd76
feat(stremio-core-protobuf): addon-detail replace addon stremio:// ur…
elpiel Oct 17, 2024
3586458
chore: address PR review comments
elpiel Oct 18, 2024
3022b9d
feat: add library_with_filters actions
tymmesyde Oct 18, 2024
318beb6
fix(stremio-core-protobuf): maniifest.proto - rename Descriptor__ to …
elpiel Oct 21, 2024
5520610
chore: clean up commented out code
elpiel Oct 21, 2024
e4ab8d5
Merge branch 'master' into feat/improve-imports-and-exports
elpiel Oct 21, 2024
e0c570b
fix(stremio-core-protobuf): ActionLoad - remove CatalogsWithExtraAll …
elpiel Oct 21, 2024
2a363bc
fix(stremio-core-protobuf): should include staticlib and dylib
elpiel Oct 21, 2024
ab430f2
Merge branch 'master' into feat/improve-imports-and-exports
elpiel Oct 24, 2024
ebf72b7
fix(stremio-core-android): Cargo - crate-type didn't work before so r…
elpiel Oct 24, 2024
711ba89
fix: build.gradle.kts - source dir for .proto files
elpiel Oct 24, 2024
5eda198
fix(stremio-core-protobuf):source dir syntax
TheBeastLT Oct 24, 2024
f6d36bc
fix: bump android ndk
TheBeastLT Oct 25, 2024
28d4888
fix: configure ranlib for each individual rust target
TheBeastLT Oct 25, 2024
8fc051b
docs: Readme, release & config - explain NDK version and ranlib path …
elpiel Oct 25, 2024
9baf392
fix: readme
elpiel Oct 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
# Check for outdated actions
updates:
- package-ecosystem: "github-actions"
directory: "/"
# Check for updates every Monday
schedule:
interval: "weekly"
39 changes: 31 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,46 @@ on:
branches:
- '**'

# Stops the running workflow of previous pushes
concurrency:
group: ${{ github.ref }}-android
cancel-in-progress: true

env:
# For the confusing protoc versioning check out these docs:
# https://protobuf.dev/support/version-support/
# v3.26.x, where `.x` is a wildcard
#
# For stremio-core-android we use version 3.21
# Check build.gradle.kts
PROTOC_VERSION: '21.x'

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set default rust toolchain
run: rustup default 1.67.1
- name: Install rustfmt
run: rustup component add rustfmt
- name: Install clippy
run: rustup component add clippy
uses: actions/checkout@v4

# add protoc because of stremio-core-csharp
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
version: "${{ env.PROTOC_VERSION }}"

- name: Rust setup (1.70.0)
uses: dtolnay/[email protected]
with:
components: rustfmt, clippy

- name: Rust cache
uses: Swatinem/rust-cache@v2

- name: Build code
run: cargo build
run: cargo build -p stremio-core-android

- name: Lint code format
run: cargo fmt --all -- --check

- name: Lint code
run: cargo clippy --all -- -D warnings
30 changes: 12 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Release stremio-core-android

on:
release:
Expand All @@ -10,7 +10,7 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v3
with:
Expand All @@ -20,22 +20,16 @@ jobs:
uses: android-actions/setup-android@v2
- name: Setup Android NDK
run: yes | sdkmanager "ndk;21.4.7075529" >/dev/null
- name: Set default rust toolchain
run: rustup default 1.67.1
- name: Install rustfmt
run: rustup component add rustfmt
- name: Install clippy
run: rustup component add clippy
- name: Add armv7 target
run: rustup target add armv7-linux-androideabi
- name: Add aarch64 target
run: rustup target add aarch64-linux-android
- name: Add i686 target
run: rustup target add i686-linux-android
- name: Add x86_64 target
run: rustup target add x86_64-linux-android
- name: Rust cache
uses: Swatinem/rust-cache@v2

# use MSRV
- name: Set Rust version to MSRV 1.70
uses: dtolnay/[email protected]
with:
# Add armv7, aarch64, i686, x86_64 targets
targets: armv7-linux-androideabi, aarch64-linux-android, i686-linux-android, x86_64-linux-android

- uses: Swatinem/rust-cache@v2

- name: Build aar
run: ./gradlew -Pversion=${GITHUB_REF##*/} publishToMavenLocal
- name: Archive artifacts
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
/.gradle
/src/debug
/src/release
/**/rust/protobuf/*
!/**/rust/protobuf/README.md
/.idea/
/local.properties

/stremio-core-protobuf/src/protobuf/*
!/stremio-core-protobuf/src/protobuf/README.md
Loading