Skip to content

Commit dc2fc15

Browse files
authored
Merge branch 'recloudstream:master' into master
2 parents 0b310ef + 511536f commit dc2fc15

File tree

15 files changed

+69
-56
lines changed

15 files changed

+69
-56
lines changed

.github/workflows/build_to_archive.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '**/wcokey.txt'
1010
workflow_dispatch:
1111

12-
concurrency:
12+
concurrency:
1313
group: "Archive-build"
1414
cancel-in-progress: true
1515

@@ -33,16 +33,18 @@ jobs:
3333
private_key: ${{ secrets.GH_APP_KEY }}
3434
repository: "recloudstream/cloudstream-archive"
3535

36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
37+
3738
- name: Set up JDK 17
3839
uses: actions/setup-java@v5
3940
with:
40-
java-version: '17'
41-
distribution: 'adopt'
41+
java-version: 17
42+
distribution: adopt
4243
cache: gradle
4344

4445
- name: Grant execute permission for gradlew
4546
run: chmod +x gradlew
47+
4648
- name: Fetch keystore
4749
id: fetch_keystore
4850
run: |
@@ -55,29 +57,28 @@ jobs:
5557
echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
5658
5759
- name: Run Gradle
58-
run: |
59-
./gradlew assemblePrerelease
60+
run: ./gradlew assemblePrerelease
6061
env:
6162
SIGNING_KEY_ALIAS: "key0"
6263
SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
6364
SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
6465
SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
6566
SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
66-
- uses: actions/checkout@v5
67+
68+
- uses: actions/checkout@v6
6769
with:
6870
repository: "recloudstream/cloudstream-archive"
6971
token: ${{ steps.generate_archive_token.outputs.token }}
7072
path: "archive"
7173

7274
- name: Move build
73-
run: |
74-
cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
75-
75+
run: cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
76+
7677
- name: Push archive
7778
run: |
7879
cd $GITHUB_WORKSPACE/archive
7980
git config --local user.email "[email protected]"
8081
git config --local user.name "GitHub Actions"
8182
git add .
8283
git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit
83-
git push --force
84+
git push --force

.github/workflows/generate_dokka.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
name: Dokka
22

3-
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
4-
concurrency:
5-
group: "dokka"
6-
cancel-in-progress: true
7-
83
on:
94
push:
10-
branches:
11-
# choose your default branch
12-
- master
13-
- main
5+
branches: [ master ]
146
paths-ignore:
157
- '*.md'
168

9+
concurrency:
10+
group: "dokka"
11+
cancel-in-progress: true
12+
1713
jobs:
1814
build:
1915
runs-on: ubuntu-latest
@@ -25,32 +21,33 @@ jobs:
2521
app_id: ${{ secrets.GH_APP_ID }}
2622
private_key: ${{ secrets.GH_APP_KEY }}
2723
repository: "recloudstream/dokka"
24+
2825
- name: Checkout
29-
uses: actions/checkout@master
26+
uses: actions/checkout@v6
3027
with:
3128
path: "src"
3229

3330
- name: Checkout dokka
34-
uses: actions/checkout@master
31+
uses: actions/checkout@v6
3532
with:
3633
repository: "recloudstream/dokka"
3734
path: "dokka"
3835
token: ${{ steps.generate_token.outputs.token }}
39-
36+
4037
- name: Clean old builds
4138
run: |
4239
cd $GITHUB_WORKSPACE/dokka/
4340
rm -rf "./app"
4441
rm -rf "./library"
4542
46-
- name: Setup JDK 17
43+
- name: Set up JDK 17
4744
uses: actions/setup-java@v5
4845
with:
4946
java-version: 17
50-
distribution: 'adopt'
47+
distribution: adopt
5148
cache: gradle
5249

53-
- name: Setup Android SDK
50+
- name: Set up Android SDK
5451
uses: android-actions/setup-android@v3
5552

5653
- name: Generate Dokka
@@ -60,8 +57,7 @@ jobs:
6057
./gradlew docs:dokkaGeneratePublicationHtml
6158
6259
- name: Copy Dokka
63-
run: |
64-
cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
60+
run: cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
6561

6662
- name: Push builds
6763
run: |

.github/workflows/issue_action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
with:
1515
app_id: ${{ secrets.GH_APP_ID }}
1616
private_key: ${{ secrets.GH_APP_KEY }}
17+
1718
- name: Similarity analysis
1819
id: similarity
1920
uses: actions-cool/issues-similarity-analysis@v1
@@ -25,6 +26,7 @@ jobs:
2526
### Your issue looks similar to these issues:
2627
Please close if duplicate.
2728
comment-body: '${index}. ${similarity} #${number}'
29+
2830
- name: Label if possible duplicate
2931
if: steps.similarity.outputs.similar-issues-found =='true'
3032
uses: actions/github-script@v8
@@ -37,7 +39,9 @@ jobs:
3739
repo: context.repo.repo,
3840
labels: ["possible duplicate"]
3941
})
40-
- uses: actions/checkout@v5
42+
43+
- uses: actions/checkout@v6
44+
4145
- name: Automatically close issues that dont follow the issue template
4246
uses: lucasbento/[email protected]
4347
with:
@@ -46,6 +50,7 @@ jobs:
4650
@${issue.user.login}: hello! :wave:
4751
This issue is being automatically closed because it does not follow the issue template."
4852
closed-issues-label: "invalid"
53+
4954
- name: Check if issue mentions a provider
5055
id: provider_check
5156
env:
@@ -55,6 +60,7 @@ jobs:
5560
pip3 install httpx
5661
RES="$(python3 ./check_issue.py)"
5762
echo "name=${RES}" >> $GITHUB_OUTPUT
63+
5864
- name: Comment if issue mentions a provider
5965
if: steps.provider_check.outputs.name != 'none'
6066
uses: actions-cool/issues-helper@v3
@@ -66,6 +72,7 @@ jobs:
6672
Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
6773
6874
Found provider name: `${{ steps.provider_check.outputs.name }}`
75+
6976
- name: Label if mentions provider
7077
if: steps.provider_check.outputs.name != 'none'
7178
uses: actions/github-script@v8
@@ -78,11 +85,10 @@ jobs:
7885
repo: context.repo.repo,
7986
labels: ["possible provider issue"]
8087
})
88+
8189
- name: Add eyes reaction to all issues
8290
uses: actions-cool/[email protected]
8391
with:
8492
type: 'issue'
8593
token: ${{ steps.generate_token.outputs.token }}
8694
emoji: 'eyes'
87-
88-

.github/workflows/prerelease.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- '*.json'
99
- '**/wcokey.txt'
1010

11-
concurrency:
11+
concurrency:
1212
group: "pre-release"
1313
cancel-in-progress: true
1414

@@ -24,16 +24,18 @@ jobs:
2424
private_key: ${{ secrets.GH_APP_KEY }}
2525
repository: "recloudstream/secrets"
2626

27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
28+
2829
- name: Set up JDK 17
2930
uses: actions/setup-java@v5
3031
with:
31-
java-version: '17'
32-
distribution: 'adopt'
32+
java-version: 17
33+
distribution: adopt
3334
cache: gradle
3435

3536
- name: Grant execute permission for gradlew
3637
run: chmod +x gradlew
38+
3739
- name: Fetch keystore
3840
id: fetch_keystore
3941
run: |
@@ -58,7 +60,7 @@ jobs:
5860
MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
5961

6062
- name: Create pre-release
61-
uses: "marvinpinto/action-automatic-releases@latest"
63+
uses: marvinpinto/action-automatic-releases@latest
6264
with:
6365
repo_token: "${{ secrets.GITHUB_TOKEN }}"
6466
automatic_release_tag: "pre-release"

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v5
9+
- uses: actions/checkout@v6
1010

1111
- name: Set up JDK 17
1212
uses: actions/setup-java@v5
1313
with:
14-
java-version: '17'
15-
distribution: 'adopt'
14+
java-version: 17
15+
distribution: adopt
1616
cache: gradle
1717

1818
- name: Grant execute permission for gradlew

.github/workflows/update_locales.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
name: Fix locale issues
22

33
on:
4-
workflow_dispatch:
54
push:
5+
branches: [ master ]
66
paths:
77
- '**.xml'
8-
branches:
9-
- master
8+
workflow_dispatch:
109

11-
concurrency:
10+
concurrency:
1211
group: "locale"
1312
cancel-in-progress: true
1413

@@ -23,15 +22,17 @@ jobs:
2322
app_id: ${{ secrets.GH_APP_ID }}
2423
private_key: ${{ secrets.GH_APP_KEY }}
2524
repository: "recloudstream/cloudstream"
26-
- uses: actions/checkout@v5
25+
26+
- uses: actions/checkout@v6
2727
with:
2828
token: ${{ steps.generate_token.outputs.token }}
29+
2930
- name: Install dependencies
30-
run: |
31-
pip3 install lxml requests
31+
run: pip3 install lxml requests
32+
3233
- name: Edit files
33-
run: |
34-
python3 .github/locales.py
34+
run: python3 .github/locales.py
35+
3536
- name: Commit to the repo
3637
run: |
3738
git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"

app/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
22
import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
33
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
4+
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
45
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
56
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
67

@@ -272,11 +273,9 @@ tasks.register<Jar>("makeJar") {
272273
tasks.withType<KotlinJvmCompile> {
273274
compilerOptions {
274275
jvmTarget.set(javaTarget)
275-
freeCompilerArgs.addAll(
276-
"-Xjvm-default=all-compatibility",
277-
"-Xannotation-default-target=param-property",
278-
"-opt-in=com.lagradost.cloudstream3.Prerelease"
279-
)
276+
jvmDefault.set(JvmDefaultMode.ENABLE)
277+
optIn.add("com.lagradost.cloudstream3.Prerelease")
278+
freeCompilerArgs.add("-Xannotation-default-target=param-property")
280279
}
281280
}
282281

app/src/main/res/values-b+cs/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,4 +763,5 @@
763763
<string name="top_left">Vlevo nahoře</string>
764764
<string name="top_center">Uprostřed nahoře</string>
765765
<string name="top_right">Vpravo nahoře</string>
766+
<string name="play_full_series_button">Přehrát celý seriál</string>
766767
</resources>

app/src/main/res/values-b+in/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@
692692
<string name="player_load_one_subtitle_online">Muat yang pertama tersedia</string>
693693
<string name="torrent_preferred_media">Aktifkan torrent di dalam Pengaturan/Penyedia/Media pilihan</string>
694694
<string name="torrent_not_accepted">Mulai ulang aplikasi dan terima pop-up Stream Torrent untuk melanjutkan.</string>
695-
<string name="software_decoding_desc">Dekode perangkat lunak memungkinkan pemutar memainkan berkas video yang tidak didukung perangkat Anda, tetapi dapat memperburuk performa atau pemutaran yang tidak stabil pada resolusi tinggi</string>
695+
<string name="software_decoding_desc">Dekode perangkat lunak memungkinkan pemutar memainkan berkas video yang tidak didukung perangkat Anda, tetapi dapat memperburuk performa atau pemutaran yang tidak stabil pada resolusi tinggi.</string>
696696
<string name="software_decoding">Dekode perangkat lunak</string>
697697
<string name="sort_episodes_rating_low_high">Rating (terendah)</string>
698698
<string name="sort_button_date">Tanggal %s</string>
@@ -759,4 +759,5 @@
759759
<string name="top_left">Atas kiri</string>
760760
<string name="top_center">Atas tengah</string>
761761
<string name="top_right">Atas kanan</string>
762+
<string name="play_full_series_button">Putar Seri Penuh</string>
762763
</resources>

app/src/main/res/values-b+it/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,4 +759,5 @@
759759
<string name="top_center">In alto al centro</string>
760760
<string name="top_right">In alto a destra</string>
761761
<string name="middle_left">In centro a sinistra</string>
762+
<string name="play_full_series_button">Riproduci serie completa</string>
762763
</resources>

0 commit comments

Comments
 (0)