Repository navigation
Expand file tree
/
Copy pathdiskusage-modernize.patch
More file actions
135 lines (132 loc) · 5.3 KB
/
Copy pathdiskusage-modernize.patch
File metadata and controls
135 lines (132 loc) · 5.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
diff -ruN '--exclude=.git' diskusage-orig/.github/workflows/build-apk.yml diskusage/.github/workflows/build-apk.yml
--- diskusage-orig/.github/workflows/build-apk.yml 1970-01-01 00:00:00.000000000 +0000
+++ diskusage/.github/workflows/build-apk.yml 2026-09-05 10:26:57.530054304 +0000
@@ -0,0 +1,35 @@
+name: Build APK
+
+on:
+ push:
+ workflow_dispatch:
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
+ - name: Set up Android SDK
+ uses: android-actions/setup-android@v3
+
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+
+ - name: Install NDK (needed for the native scan.c build)
+ run: sdkmanager "ndk;25.2.9519653"
+
+ - name: Build debug APK
+ run: ./gradlew assembleDebug --stacktrace
+
+ - name: Upload APK
+ uses: actions/upload-artifact@v4
+ with:
+ name: diskusage-debug-apk
+ path: app/build/outputs/apk/debug/*.apk
diff -ruN '--exclude=.git' diskusage-orig/app/build.gradle diskusage/app/build.gradle
--- diskusage-orig/app/build.gradle 2026-09-05 10:28:13.898964623 +0000
+++ diskusage/app/build.gradle 2026-09-05 10:27:02.435411492 +0000
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-apply plugin: 'com.google.protobuf'
android {
- compileSdkVersion 31
- buildToolsVersion "31"
+ namespace 'com.google.android.diskusage'
+ compileSdk 34
+ buildToolsVersion "34.0.0"
+ ndkVersion "25.2.9519653"
defaultConfig {
applicationId "com.google.android.diskusage"
- targetSdkVersion 30
+ targetSdk 33
minSdk 21
}
buildFeatures {
@@ -47,12 +48,12 @@
dependencies {
// implementation files('src/main/extra/system.jar')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- implementation 'androidx.core:core-ktx:1.6.0'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
- implementation 'me.zhanghai.android.appiconloader:appiconloader:1.3.1'
+ implementation 'androidx.core:core-ktx:1.12.0'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+ implementation 'me.zhanghai.android.appiconloader:appiconloader:1.5.0'
implementation "com.louiscad.splitties:splitties-toast:$splitties_version"
implementation "com.louiscad.splitties:splitties-resources:$splitties_version"
- testImplementation 'junit:junit:4.13.1'
+ testImplementation 'junit:junit:4.13.2'
}
diff -ruN '--exclude=.git' diskusage-orig/app/src/main/AndroidManifest.xml diskusage/app/src/main/AndroidManifest.xml
--- diskusage-orig/app/src/main/AndroidManifest.xml 2026-09-05 10:28:13.900718409 +0000
+++ diskusage/app/src/main/AndroidManifest.xml 2026-09-05 10:20:19.616269798 +0000
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.android.diskusage"
android:installLocation="auto"
android:versionCode="5001"
android:versionName="5.0-alpha1">
@@ -27,7 +26,7 @@
android:theme="@style/Theme"
android:hardwareAccelerated="true"
android:requestLegacyExternalStorage="true">
- <activity android:name=".ui.SelectActivity">
+ <activity android:name=".ui.SelectActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff -ruN '--exclude=.git' diskusage-orig/build.gradle diskusage/build.gradle
--- diskusage-orig/build.gradle 2026-09-05 10:28:13.913377214 +0000
+++ diskusage/build.gradle 2026-09-05 10:19:36.113573971 +0000
@@ -1,22 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.6.20'
+ ext.kotlin_version = '1.9.22'
ext.splitties_version = '3.0.0'
repositories {
- jcenter()
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.1.2'
- classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
+ classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
- jcenter()
google()
mavenCentral()
}
diff -ruN '--exclude=.git' diskusage-orig/gradle/wrapper/gradle-wrapper.properties diskusage/gradle/wrapper/gradle-wrapper.properties
--- diskusage-orig/gradle/wrapper/gradle-wrapper.properties 2026-09-05 10:28:13.932891197 +0000
+++ diskusage/gradle/wrapper/gradle-wrapper.properties 2026-09-05 10:19:40.243482848 +0000
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip