Skip to content

Commit 5836f3a

Browse files
authored
Merge pull request #13425 from TeamNewPipe/depUpdate
2 parents 3e297fd + aa094bc commit 5836f3a

File tree

11 files changed

+45
-165
lines changed

11 files changed

+45
-165
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
strategy:
7070
matrix:
7171
include:
72-
- api-level: 21
72+
- api-level: 23
7373
target: default
7474
arch: x86
7575
- api-level: 35

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ configure<ApplicationExtension> {
4242
defaultConfig {
4343
applicationId = "org.schabi.newpipe"
4444
resValue("string", "app_name", "NewPipe")
45-
minSdk = 21
45+
minSdk = 23
4646
targetSdk = 35
4747

4848
versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1010

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2024 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.fragments.list.kiosk;
27

38
import android.os.Bundle;
@@ -33,30 +38,6 @@
3338

3439
import io.reactivex.rxjava3.core.Single;
3540

36-
/**
37-
* Created by Christian Schabesberger on 23.09.17.
38-
* <p>
39-
* Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
40-
* KioskFragment.java is part of NewPipe.
41-
* </p>
42-
* <p>
43-
* NewPipe is free software: you can redistribute it and/or modify
44-
* it under the terms of the GNU General Public License as published by
45-
* the Free Software Foundation, either version 3 of the License, or
46-
* (at your option) any later version.
47-
* </p>
48-
* <p>
49-
* NewPipe is distributed in the hope that it will be useful,
50-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
51-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
52-
* GNU General Public License for more details.
53-
* </p>
54-
* <p>
55-
* You should have received a copy of the GNU General Public License
56-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
57-
* </p>
58-
*/
59-
6041
public class KioskFragment extends BaseListInfoFragment<StreamInfoItem, KioskInfo> {
6142
@State
6243
String kioskId = "";

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2016-2026 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.player.playqueue;
27

38
import android.content.Context;
@@ -22,30 +27,6 @@
2227
import io.reactivex.rxjava3.core.Observer;
2328
import io.reactivex.rxjava3.disposables.Disposable;
2429

25-
/**
26-
* Created by Christian Schabesberger on 01.08.16.
27-
* <p>
28-
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
29-
* InfoListAdapter.java is part of NewPipe.
30-
* </p>
31-
* <p>
32-
* NewPipe is free software: you can redistribute it and/or modify
33-
* it under the terms of the GNU General Public License as published by
34-
* the Free Software Foundation, either version 3 of the License, or
35-
* (at your option) any later version.
36-
* </p>
37-
* <p>
38-
* NewPipe is distributed in the hope that it will be useful,
39-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
40-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41-
* GNU General Public License for more details.
42-
* </p>
43-
* <p>
44-
* You should have received a copy of the GNU General Public License
45-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
46-
* </p>
47-
*/
48-
4930
public class PlayQueueAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
5031
private static final String TAG = PlayQueueAdapter.class.toString();
5132

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2016-2021 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.player.playqueue;
27

38
import android.view.View;
@@ -8,30 +13,6 @@
813

914
import org.schabi.newpipe.R;
1015

11-
/**
12-
* Created by Christian Schabesberger on 01.08.16.
13-
* <p>
14-
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
15-
* StreamInfoItemHolder.java is part of NewPipe.
16-
* </p>
17-
* <p>
18-
* NewPipe is free software: you can redistribute it and/or modify
19-
* it under the terms of the GNU General Public License as published by
20-
* the Free Software Foundation, either version 3 of the License, or
21-
* (at your option) any later version.
22-
* </p>
23-
* <p>
24-
* NewPipe is distributed in the hope that it will be useful,
25-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
26-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27-
* GNU General Public License for more details.
28-
* </p>
29-
* <p>
30-
* You should have received a copy of the GNU General Public License
31-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
32-
* </p>
33-
*/
34-
3516
public class PlayQueueItemHolder extends RecyclerView.ViewHolder {
3617
public final TextView itemVideoTitleView;
3718
public final TextView itemDurationView;

app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.settings;
27

38
import android.content.DialogInterface;
@@ -30,27 +35,6 @@
3035
import io.reactivex.rxjava3.disposables.Disposable;
3136
import io.reactivex.rxjava3.schedulers.Schedulers;
3237

33-
/**
34-
* Created by Christian Schabesberger on 26.09.17.
35-
* SelectChannelFragment.java is part of NewPipe.
36-
* <p>
37-
* NewPipe is free software: you can redistribute it and/or modify
38-
* it under the terms of the GNU General Public License as published by
39-
* the Free Software Foundation, either version 3 of the License, or
40-
* (at your option) any later version.
41-
* </p>
42-
* <p>
43-
* NewPipe is distributed in the hope that it will be useful,
44-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
45-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
46-
* GNU General Public License for more details.
47-
* </p>
48-
* <p>
49-
* You should have received a copy of the GNU General Public License
50-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
51-
* </p>
52-
*/
53-
5438
public class SelectChannelFragment extends DialogFragment {
5539

5640
private OnSelectedListener onSelectedListener = null;

app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.settings;
27

38
import android.content.DialogInterface;
@@ -30,27 +35,6 @@
3035
import io.reactivex.rxjava3.disposables.Disposable;
3136
import io.reactivex.rxjava3.schedulers.Schedulers;
3237

33-
/**
34-
* Created by Christian Schabesberger on 26.09.17.
35-
* SelectChannelFragment.java is part of NewPipe.
36-
* <p>
37-
* NewPipe is free software: you can redistribute it and/or modify
38-
* it under the terms of the GNU General Public License as published by
39-
* the Free Software Foundation, either version 3 of the License, or
40-
* (at your option) any later version.
41-
* </p>
42-
* <p>
43-
* NewPipe is distributed in the hope that it will be useful,
44-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
45-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
46-
* GNU General Public License for more details.
47-
* </p>
48-
* <p>
49-
* You should have received a copy of the GNU General Public License
50-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
51-
* </p>
52-
*/
53-
5438
public class SelectFeedGroupFragment extends DialogFragment {
5539

5640
private OnSelectedListener onSelectedListener = null;

app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2022 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.settings;
27

38
import android.os.Bundle;
@@ -25,27 +30,6 @@
2530
import java.util.List;
2631
import java.util.Vector;
2732

28-
/**
29-
* Created by Christian Schabesberger on 09.10.17.
30-
* SelectKioskFragment.java is part of NewPipe.
31-
* <p>
32-
* NewPipe is free software: you can redistribute it and/or modify
33-
* it under the terms of the GNU General Public License as published by
34-
* the Free Software Foundation, either version 3 of the License, or
35-
* (at your option) any later version.
36-
* </p>
37-
* <p>
38-
* NewPipe is distributed in the hope that it will be useful,
39-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
40-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41-
* GNU General Public License for more details.
42-
* </p>
43-
* <p>
44-
* You should have received a copy of the GNU General Public License
45-
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
46-
* </p>
47-
*/
48-
4933
public class SelectKioskFragment extends DialogFragment {
5034
private SelectKioskAdapter selectKioskAdapter = null;
5135

app/src/main/java/org/schabi/newpipe/util/ListHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public final class ListHelper {
5858
/**
5959
* List of supported YouTube Itag ids.
6060
* The original order is kept.
61-
* @see {@link org.schabi.newpipe.extractor.services.youtube.ItagItem#ITAG_LIST}
61+
* @see org.schabi.newpipe.extractor.services.youtube.ItagItem
6262
*/
6363
private static final List<Integer> SUPPORTED_ITAG_IDS =
6464
List.of(

app/src/main/java/org/schabi/newpipe/util/ZipHelper.java

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2018-2026 NewPipe contributors <https://newpipe.net>
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*/
5+
16
package org.schabi.newpipe.util;
27

38
import org.schabi.newpipe.streams.io.SharpInputStream;
@@ -16,26 +21,6 @@
1621
import java.util.zip.ZipInputStream;
1722
import java.util.zip.ZipOutputStream;
1823

19-
/**
20-
* Created by Christian Schabesberger on 28.01.18.
21-
* Copyright 2018 Christian Schabesberger <chris.schabesberger@mailbox.org>
22-
* ZipHelper.java is part of NewPipe
23-
* <p>
24-
* License: GPL-3.0+
25-
* This program is free software: you can redistribute it and/or modify
26-
* it under the terms of the GNU General Public License as published by
27-
* the Free Software Foundation, either version 3 of the License, or
28-
* (at your option) any later version.
29-
* <p>
30-
* This program is distributed in the hope that it will be useful,
31-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
32-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
33-
* GNU General Public License for more details.
34-
* <p>
35-
* You should have received a copy of the GNU General Public License
36-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
37-
*/
38-
3924
public final class ZipHelper {
4025
@FunctionalInterface
4126
public interface InputStreamConsumer {

0 commit comments

Comments
 (0)