Skip to content

Commit 8ddb088

Browse files
committed
feat(build): use android-legacy-maven repo, optimize ci
1 parent 1896cb6 commit 8ddb088

5 files changed

Lines changed: 13 additions & 55 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,62 +14,19 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
18-
19-
- name: Set up JDK 17 (for sdkmanager)
20-
uses: actions/setup-java@v4
21-
with:
22-
java-version: '17'
23-
distribution: 'temurin'
17+
uses: actions/checkout@v6
2418

2519
- name: Install SDK platform 25 & build-tools 25.0.0
2620
run: |
2721
SDKMANAGER="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
2822
yes | "$SDKMANAGER" --licenses > /dev/null 2>&1 || true
2923
"$SDKMANAGER" "platforms;android-25" "build-tools;25.0.0"
3024
31-
- name: Set up JDK 8 (for Gradle build)
32-
uses: actions/setup-java@v4
33-
with:
34-
java-version: '8'
35-
distribution: 'temurin'
36-
37-
- name: Patch build files (AGP 2.3.2 → 3.1.4, Gradle 3.3 → 4.6)
38-
run: |
39-
cat > build.gradle << 'EOF'
40-
buildscript {
41-
repositories {
42-
google()
43-
mavenCentral()
44-
}
45-
dependencies {
46-
classpath 'com.android.tools.build:gradle:3.1.4'
47-
}
48-
}
49-
allprojects {
50-
repositories {
51-
google()
52-
mavenCentral()
53-
}
54-
}
55-
task clean(type: Delete) {
56-
delete rootProject.buildDir
57-
}
58-
EOF
59-
60-
sed -i 's|distributionUrl=.*|distributionUrl=https\\://services.gradle.org/distributions/gradle-4.6-all.zip|' \
61-
gradle/wrapper/gradle-wrapper.properties
62-
63-
64-
echo "=== build.gradle ===" && cat build.gradle
65-
echo "=== app/build.gradle ===" && cat app/build.gradle
66-
echo "=== gradle-wrapper.properties ===" && cat gradle/wrapper/gradle-wrapper.properties
67-
6825
- name: Grant execute permission for gradlew
6926
run: chmod +x gradlew
7027

7128
- name: Cache Gradle packages
72-
uses: actions/cache@v4
29+
uses: actions/cache@v6
7330
with:
7431
path: |
7532
~/.gradle/caches
@@ -79,17 +36,17 @@ jobs:
7936
${{ runner.os }}-gradle-
8037
8138
- name: Build debug APK
82-
run: ./gradlew assembleDebug --no-daemon --stacktrace
83-
env:
84-
ANDROID_SDK_ROOT: ${{ env.ANDROID_SDK_ROOT }}
39+
run: |
40+
export JAVA_HOME=$JAVA_HOME_8_X64
41+
./gradlew assembleDebug --no-daemon --stacktrace
8542
8643
- name: Find APK
8744
if: always()
8845
run: find app/build/outputs -name "*.apk"
8946

9047
- name: Upload APK artifact
91-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v6
9249
with:
9350
name: notPipe-debug-apk
9451
path: app/build/outputs/apk/debug/*.apk
95-
retention-days: 30
52+
retention-days: 30

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ List of supported APIs:
2121
* [MyIntCountry](http://myintcountry.ru/index.php?board=android&action=display&num=1)
2222
* Telegram (link at the top of the README)
2323
* [4PDA](https://4pda.to/forum/index.php?showtopic=1119054)
24-
* [Appteka](https://appteka.store/search?q=notPipe)
24+
* [Appteka](https://appteka.store/apps/8b0r294404)
2525
* [NeonApps](http://neonapps.ru/?app=456)
2626

2727
## Features

README.ru.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* [Моя Интернет Страна](http://myintcountry.ru/index.php?board=android&action=display&num=1)
2222
* Telegram (ссылка в начале README)
2323
* [4PDA](https://4pda.to/forum/index.php?showtopic=1119054)
24-
* [Appteka](https://appteka.store/search?q=notPipe)
24+
* [Appteka](https://appteka.store/apps/8b0r294404)
2525
* [NeonApps](http://neonapps.ru/?app=456)
2626
## Возможности
2727
> [!NOTE]

app/src/main/java/io/github/gohoski/notpipe/VideoActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,6 @@ protected void onProgressUpdate(Integer... values) {
22822282

22832283
@Override
22842284
protected void onCancelled() {
2285-
// Restore screen sleep behavior if download was aborted
22862285
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
22872286
if (progressView != null) {
22882287
progressView.setVisibility(View.GONE);

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
maven { url "https://gohoski.github.io/android-legacy-maven/" }
6+
mavenCentral()
67
}
78
dependencies {
89
classpath 'com.android.tools.build:gradle:2.3.2'
@@ -14,7 +15,8 @@ buildscript {
1415

1516
allprojects {
1617
repositories {
17-
jcenter()
18+
maven { url "https://gohoski.github.io/android-legacy-maven/" }
19+
mavenCentral()
1820
}
1921
}
2022

0 commit comments

Comments
 (0)