Skip to content

Commit 52a2acc

Browse files
Merge branch 'refactor' into Playlist-Compose
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/MainActivity.java # app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt # app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java # app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt # app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java # app/src/main/java/org/schabi/newpipe/paging/CommentsSource.kt # app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt # app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt # app/src/main/java/org/schabi/newpipe/viewmodels/CommentsViewModel.kt # build.gradle
2 parents aec18c7 + fbafdeb commit 52a2acc

220 files changed

Lines changed: 4519 additions & 2412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ The [ktlint](https://github.com/pinterest/ktlint) plugin does the same job as ch
7979

8080
## Communication
8181

82-
* The #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) has the core team and other developers in it. [Click here for webchat](https://web.libera.chat/#newpipe)!
83-
* You can also use a Matrix account to join the NewPipe channel at [#newpipe:libera.chat](https://matrix.to/#/#newpipe:libera.chat). Some convenient clients, available both for phone and desktop, are listed at that link.
84-
* You can post your suggestions, changes, ideas etc. on either GitHub or IRC.
82+
* You can use a Matrix account to join the NewPipe channel at [#newpipe:matrix.newpipe-ev.de](https://matrix.to/#/#newpipe:matrix.newpipe-ev.de). Some convenient clients, available both for phone and desktop, are listed at that link.
83+
* Alternatively, the #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) can also be joined, as it is bridged to the Matrix room. [Click here for webchat](https://web.libera.chat/#newpipe)!
84+
* You can post your suggestions, changes, ideas etc. on either GitHub or Matrix (including via IRC).

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ contact_links:
33
- name: ❓ Question
44
url: https://github.com/TeamNewPipe/NewPipe/discussions/new?category=questions
55
about: Ask about anything NewPipe-related
6+
- name: 💬 Matrix
7+
url: https://matrix.to/#/#newpipe:matrix.newpipe-ev.de
8+
about: Chat with us via Matrix for quick Q/A
69
- name: 💬 IRC
710
url: https://web.libera.chat/#newpipe
811
about: Chat with us via IRC for quick Q/A
9-
- name: 💬 Matrix
10-
url: https://matrix.to/#/#newpipe:libera.chat
11-
about: Chat with us via Matrix for quick Q/A

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
BRANCH: ${{ github.head_ref }}
4848
run: git checkout -B "$BRANCH"
4949

50-
- name: set up JDK 17
50+
- name: set up JDK
5151
uses: actions/setup-java@v4
5252
with:
53-
java-version: 17
53+
java-version: 21
5454
distribution: "temurin"
5555
cache: 'gradle'
5656

@@ -88,10 +88,10 @@ jobs:
8888
sudo udevadm control --reload-rules
8989
sudo udevadm trigger --name-match=kvm
9090
91-
- name: set up JDK 17
91+
- name: set up JDK
9292
uses: actions/setup-java@v4
9393
with:
94-
java-version: 17
94+
java-version: 21
9595
distribution: "temurin"
9696
cache: 'gradle'
9797

@@ -121,10 +121,10 @@ jobs:
121121
with:
122122
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
123123

124-
- name: Set up JDK 17
124+
- name: Set up JDK
125125
uses: actions/setup-java@v4
126126
with:
127-
java-version: 17
127+
java-version: 21
128128
distribution: "temurin"
129129
cache: 'gradle'
130130

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ captures/
1010
*.class
1111
app/debug/
1212
app/release/
13+
.kotlin/
1314

1415
# vscode / eclipse files
1516
*.classpath

.idea/icon.svg

Lines changed: 21 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)