Skip to content

Commit a4c3aab

Browse files
committed
Remove the code the Compose rewrite left behind
buildSrc holds two Gradle task classes no build script registers, and neither output survives: there is no LangList.java and no material_theme_builder.xml, the locale list comes from BuildConfig.TRANSLATIONS computed in manager/build.gradle.kts, and the only XML theme left wraps Theme.DeviceDefault.NoActionBar. Its README documents registering both tasks against :app, gone since #796. The directory goes, with the format task's include for its Kotlin. The version catalog still pins the whole View stack -- Glide, Rikka's rikkax-* widgets, Fragment, Navigation 2 with safeargs, preference, RecyclerView, SwipeRefreshLayout, ConstraintLayout, Material Components for Views. No build script references any of those 26 aliases, the safeargs plugin, or the nav, glide and appcenter versions. rikkax-parcelablelist stays; :services:manager-service exposes it for the AIDL's ParcelableListSlice. hiddenapi/stubs carries 20 files nothing compiles against, mostly LSPosed-era rather than rewrite fallout. Where the platform declares the same class the stub is already inert: :daemon compiles PackageManager.VERSION_CODE_HIGHEST and XSharedPreferences compiles Environment.getDataDirectory(), neither of which the stub declares, so android.jar wins today. They are compileOnly and never reach a dex, so lsplant's FindClass on dalvik/system/VMRuntime keeps resolving the framework class. Four HiddenApiBridge wrappers and the stub members that existed only to type them go with them. In :manager the four @serializable models for the Actions runs and artifacts API became unreachable when eb07955 moved canary sourcing to release prereleases, and relativeTime, levelLabel, sectionHeaderStyle, SeedScheme.parseHex, VectorLightColors, VectorDarkColors, ModulesViewModel.selectAll, LogPaneState.atOldest and GOOD_FIRST_ISSUE_URL have no call site at all. RelativeTime.kt becomes TimeText.kt, since relative time is what left it. Seventeen strings go too, translations deleted alongside their source so the next Crowdin pull does not add them back. Three of them -- store_offline, settings_window, module_toggle_failed -- read more like missing features than dead weight, and their translated copy in eighteen languages goes with them. Daemon-side, CliHandler.isPackageInstalled, Utils.getZoneId, Utils.isLENOVO and :xposed's trackedApks have no caller; the live tracker is LoadedApkTracker.activeApks. magisk-loader goes as well, and that is the one deletion here that ships behaviour. Before #550 the loader baked the raw githubusercontent URL of magisk-loader/update/zygisk.json into every module.prop, so Magisk on a pre-v2.0 install polls it and will now get a 404. Effectively everyone is on v2.0 by now, and zygisk/update.json -- what module.prop has pointed at since -- is untouched. Nothing else changes behaviour. Release builds already shrink unused resources, and no deletion touches a de.robv or io.github.libxposed surface, an AIDL transaction id, a JNI name, a manifest entry or a keep rule.
1 parent ddb4803 commit a4c3aab

113 files changed

Lines changed: 17 additions & 1469 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/workflows/core.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292
echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
9393
echo 'org.gradle.parallel=true' >> ~/.gradle/gradle.properties
9494
echo 'org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC' >> ~/.gradle/gradle.properties
95-
echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
9695
9796
- name: Setup ninja
9897
uses: seanmiddleditch/gha-setup-ninja@v6

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ tasks.register<KtfmtFormatTask>("format") {
311311
"*/build.gradle.kts",
312312
"hiddenapi/*/build.gradle.kts",
313313
"services/*-service/build.gradle.kts",
314-
"buildSrc/src/main/kotlin/**/*.kt",
315314
)
316315
// The daemon subproject is stuck on ktfmt's default (Meta) style instead of the
317316
// kotlinLangStyle() applied everywhere else — the wrong style was set for it, but a

buildSrc/README.md

Lines changed: 0 additions & 57 deletions
This file was deleted.

buildSrc/build.gradle.kts

Lines changed: 0 additions & 13 deletions
This file was deleted.

buildSrc/src/main/kotlin/GenerateLangListTask.kt

Lines changed: 0 additions & 91 deletions
This file was deleted.

buildSrc/src/main/kotlin/GenerateMaterialThemeTask.kt

Lines changed: 0 additions & 54 deletions
This file was deleted.

daemon/src/main/kotlin/org/matrix/vector/daemon/ipc/CliHandler.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.matrix.vector.daemon.CliResponse
1010
import org.matrix.vector.daemon.data.ConfigCache
1111
import org.matrix.vector.daemon.data.ModuleDatabase
1212
import org.matrix.vector.daemon.data.PreferenceStore
13-
import org.matrix.vector.daemon.system.*
1413

1514
object CliHandler {
1615

@@ -44,11 +43,6 @@ object CliHandler {
4443
"Status Notification" to PreferenceStore.isStatusNotificationEnabled())
4544
}
4645

47-
private fun isPackageInstalled(pkg: String, userId: Int = 0): Boolean {
48-
return runCatching { packageManager?.getPackageInfo(pkg, 0, userId) != null }
49-
.getOrDefault(false)
50-
}
51-
5246
private fun handleModules(request: CliRequest): Any {
5347
return when (request.action) {
5448
"ls" -> {

gradle/libs.versions.toml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[versions]
22
agp = "9.3.1"
33
kotlin = "2.4.10"
4-
nav = "2.9.8"
5-
appcenter = "5.0.5"
6-
glide = "5.0.9"
74
okhttp = "5.4.0"
85
ktfmt = "0.26.0"
96
coroutines = "1.11.0"
@@ -24,7 +21,6 @@ agp-app = { id = "com.android.application", version.ref = "agp" }
2421
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2522
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
2623
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
27-
nav-safeargs = { id = "androidx.navigation.safeargs", version.ref = "nav" }
2824
ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
2925
lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.4" }
3026

@@ -62,42 +58,15 @@ coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp"
6258

6359
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.11.0" }
6460

65-
rikkax-appcompat = { module = "dev.rikka.rikkax.appcompat:appcompat", version = "1.6.1" }
66-
rikkax-core = { module = "dev.rikka.rikkax.core:core", version = "1.4.1" }
67-
rikkax-insets = { module = "dev.rikka.rikkax.insets:insets", version = "1.3.0" }
68-
rikkax-layoutinflater = { module = "dev.rikka.rikkax.layoutinflater:layoutinflater", version = "1.3.0" }
69-
rikkax-material = { module = "dev.rikka.rikkax.material:material", version = "2.7.2" }
70-
rikkax-material-preference = { module = "dev.rikka.rikkax.material:material-preference", version = "2.0.0" }
7161
rikkax-parcelablelist = { module = "dev.rikka.rikkax.parcelablelist:parcelablelist", version = "2.0.1" }
72-
rikkax-recyclerview = { module = "dev.rikka.rikkax.recyclerview:recyclerview-ktx", version = "1.3.2" }
73-
rikkax-widget-borderview = { module = "dev.rikka.rikkax.widget:borderview", version = "1.1.0" }
74-
rikkax-widget-mainswitchbar = { module = "dev.rikka.rikkax.widget:mainswitchbar", version = "1.0.2" }
7562

76-
androidx-activity = { module = "androidx.activity:activity", version = "1.13.0" }
7763
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.10.0" }
78-
androidx-browser = { module = "androidx.browser:browser", version = "1.10.0" }
79-
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
80-
androidx-core = { module = "androidx.core:core", version = "1.19.0" }
81-
androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.9" }
82-
androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" }
83-
androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" }
84-
androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" }
85-
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
86-
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.2.0" }
87-
88-
glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
89-
glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "glide" }
9064

9165
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
9266
okhttp-dnsoverhttps = { group = "com.squareup.okhttp3", name = "okhttp-dnsoverhttps", version.ref = "okhttp" }
93-
okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
9467

9568
agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" }
96-
appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" }
97-
material = { module = "com.google.android.material:material", version = "1.12.0" }
9869
gson = { module = "com.google.code.gson:gson", version = "2.14.0" }
99-
hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "6.1" }
100-
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
10170
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
10271
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
10372
picocli = { module = "info.picocli:picocli", version = "4.7.7" }

hiddenapi/bridge/src/main/java/hidden/ByteBufferDexClassLoader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,4 @@ public ByteBufferDexClassLoader(ByteBuffer[] dexFiles, ClassLoader parent) {
1313
public ByteBufferDexClassLoader(ByteBuffer[] dexFiles, String librarySearchPath, ClassLoader parent) {
1414
super(dexFiles, librarySearchPath, parent);
1515
}
16-
17-
public String getLdLibraryPath() {
18-
return super.getLdLibraryPath();
19-
}
2016
}

hiddenapi/bridge/src/main/java/hidden/HiddenApiBridge.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,14 @@
2020
package hidden;
2121

2222
import android.app.ActivityManager;
23-
import android.content.BroadcastReceiver;
2423
import android.content.Context;
25-
import android.content.Intent;
26-
import android.content.IntentFilter;
2724
import android.content.pm.ApplicationInfo;
28-
import android.content.pm.PackageInstaller;
2925
import android.content.res.AssetManager;
3026
import android.content.res.CompatibilityInfo;
3127
import android.content.res.Resources;
3228
import android.content.res.ResourcesImpl;
3329
import android.os.Binder;
3430
import android.os.Build;
35-
import android.os.Environment;
36-
import android.os.Handler;
3731
import android.os.IBinder;
3832
import android.os.UserHandle;
3933
import android.system.ErrnoException;
@@ -43,7 +37,6 @@
4337

4438
import androidx.annotation.RequiresApi;
4539

46-
import java.io.File;
4740
import java.io.FileDescriptor;
4841

4942
public class HiddenApiBridge {
@@ -59,32 +52,10 @@ public static void Resources_setImpl(Resources resources, ResourcesImpl impl) {
5952
resources.setImpl(impl);
6053
}
6154

62-
public static int PackageInstaller_SessionParams_installFlags(PackageInstaller.SessionParams params) {
63-
return params.installFlags;
64-
}
65-
66-
public static void PackageInstaller_SessionParams_installFlags(PackageInstaller.SessionParams params, int flags) {
67-
params.installFlags = flags;
68-
}
69-
7055
public static IBinder Context_getActivityToken(Context ctx) {
7156
return ctx.getActivityToken();
7257
}
7358

74-
public static File Environment_getDataProfilesDePackageDirectory(int userId, String packageName) {
75-
return Environment.getDataProfilesDePackageDirectory(userId, packageName);
76-
}
77-
78-
public static Intent Context_registerReceiverAsUser(Context ctx, BroadcastReceiver receiver, UserHandle user,
79-
IntentFilter filter, String broadcastPermission, Handler scheduler) {
80-
81-
return ctx.registerReceiverAsUser(receiver, user, filter, broadcastPermission, scheduler);
82-
}
83-
84-
public static UserHandle UserHandle_ALL() {
85-
return UserHandle.ALL;
86-
}
87-
8859
public static UserHandle UserHandle(int h) {
8960
return new UserHandle(h);
9061
}

0 commit comments

Comments
 (0)