Merge pull request #153 from solrudev/develop

0.19.0

Author: solrudev

README.md

@@ -37,7 +37,7 @@ Ackpine depends on Jetpack libraries, so it's also necessary to add the `google(
 
 ```toml
 [versions]
-ackpine = "0.18.6"
+ackpine = "0.19.0"
 
 [libraries]
 ackpine-core = { module = "ru.solrudev.ackpine:ackpine-core", version.ref = "ackpine" }
@@ -78,7 +78,7 @@ ackpine = [
 
 ```kotlin
 dependencies {
-    val ackpineVersion = "0.18.6"
+    val ackpineVersion = "0.19.0"
     implementation("ru.solrudev.ackpine:ackpine-core:$ackpineVersion")
 
     // optional - Kotlin extensions and Coroutines support
@@ -105,7 +105,7 @@ dependencies {
 License
 -------
 
-    Copyright (C) 2023-2025 Ilya Fomichev
+    Copyright (C) 2023-2026 Ilya Fomichev
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

ackpine-api/api-main/api/api-main.api

@@ -687,7 +687,6 @@ public final class ru/solrudev/ackpine/uninstaller/UninstallFailure$Exceptional
 }
 
 public final class ru/solrudev/ackpine/uninstaller/UninstallFailure$Generic : ru/solrudev/ackpine/uninstaller/UninstallFailure {
-	public static final field INSTANCE Lru/solrudev/ackpine/uninstaller/UninstallFailure$Generic;
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;)V
 	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/uninstaller/UninstallFailure.kt

@@ -32,17 +32,7 @@ public sealed class UninstallFailure(public open val message: String?) : Failure
 	public data class Generic @JvmOverloads public constructor(
 		public override val message: String? = null
 	) : UninstallFailure(message) {
-
 		private companion object {
-
-			@Deprecated(
-				message = "Binary and Java source compatibility. Will be removed in the next minor release",
-				level = DeprecationLevel.HIDDEN
-			)
-			@Suppress("RedundantVisibilityModifier")
-			@JvmField
-			public val INSTANCE: Generic = Generic()
-
 			private const val serialVersionUID: Long = 90119473338043981L
 		}
 	}

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/uninstaller/parameters/UninstallParameters.kt

@@ -112,6 +112,11 @@ public class UninstallParameters private constructor(
 		 *
 		 * Default value is [UninstallerType.DEFAULT].
 		 */
+		@set:Deprecated(
+			message = "The setter was mistakenly left public and will be removed in the next minor release. " +
+					"Use setUninstallerType function instead.",
+			level = DeprecationLevel.ERROR
+		)
 		public var uninstallerType: UninstallerType = UninstallerType.DEFAULT
 
 		/**
@@ -143,6 +148,7 @@ public class UninstallParameters private constructor(
 		 * Sets [UninstallParameters.uninstallerType].
 		 */
 		public fun setUninstallerType(uninstallerType: UninstallerType): Builder = apply {
+			@Suppress("DEPRECATION_ERROR")
 			this.uninstallerType = uninstallerType
 		}
 

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/plugability/AckpineServiceProviders.kt

@@ -35,8 +35,9 @@ internal class AckpineServiceProviders(private val serviceProviders: Lazy<Set<Ac
 
 	@JvmSynthetic
 	internal fun getByPlugins(pluginClasses: Collection<Class<out AckpinePlugin<*>>>): List<AckpineServiceProvider> {
-		val plugins = pluginClasses.map { pluginClass -> AckpinePluginCache.get(pluginClass) }
-		val appliedPlugins = plugins.map { plugin -> plugin.id }
+		val appliedPlugins = pluginClasses.mapTo(mutableSetOf()) { pluginClass ->
+			AckpinePluginCache.get(pluginClass).id
+		}
 		return getAll().filter { provider ->
 			provider.pluginIdentifiers.any { it in appliedPlugins }
 		}

ackpine-plugins/shizuku-ktx/src/main/kotlin/ru/solrudev/ackpine/shizuku/ShizukuPluginParametersDsl.kt

@@ -58,8 +58,8 @@ public interface ShizukuPluginParametersDsl {
 	public var allUsers: Boolean
 
 	/**
-	 * Installer package for the app. Empty by default, so the calling app package name will be used. Works only on
-	 * Android 9+.
+	 * Installer package for the app. Empty by default, so the calling app package name will be used. Takes effect only
+	 * on Android 9+.
 	 */
 	public var installerPackageName: String
 }

ackpine-plugins/shizuku-ktx/src/main/kotlin/ru/solrudev/ackpine/shizuku/UninstallParametersDsl.kt

@@ -20,6 +20,8 @@ import ru.solrudev.ackpine.uninstaller.parameters.UninstallParametersDsl
 
 /**
  * Applies [ShizukuUninstallPlugin] to the session.
+ *
+ * The plugin's parameters take effect only on Android 8+.
  */
 public inline fun UninstallParametersDsl.useShizuku(
 	configure: ShizukuUninstallPluginParametersDsl.() -> Unit = {}

ackpine-plugins/shizuku/src/main/kotlin/ru/solrudev/ackpine/shizuku/ShizukuPackageInstaller.kt

@@ -110,6 +110,10 @@ internal class ShizukuPackageInstaller(
 	}
 
 	override fun uninstall(packageName: String, statusReceiver: IntentSender, ackpineSessionId: UUID) {
+		if (Build.VERSION.SDK_INT < 26) {
+			packageInstaller.uninstall(packageName, statusReceiver)
+			return
+		}
 		val shizukuParams = uninstallParameters[ackpineSessionId]
 		var flags = 0
 		if (shizukuParams != null) {

ackpine-plugins/shizuku/src/main/kotlin/ru/solrudev/ackpine/shizuku/ShizukuPlugin.kt

@@ -190,8 +190,8 @@ public class ShizukuPlugin private constructor() : AckpinePlugin<ShizukuPlugin.P
 				private set
 
 			/**
-			 * Installer package for the app. Empty by default, so the calling app package name will be used. Works only
-			 * on Android 9+.
+			 * Installer package for the app. Empty by default, so the calling app package name will be used. Takes
+			 * effect only on Android 9+.
 			 */
 			public var installerPackageName: String = ""
 				private set

ackpine-plugins/shizuku/src/main/kotlin/ru/solrudev/ackpine/shizuku/ShizukuUninstallPlugin.kt

@@ -27,6 +27,8 @@ import ru.solrudev.ackpine.uninstaller.parameters.UninstallerType.INTENT_BASED
 /**
  * Ackpine plugin which enables uninstallation through Shizuku when applied.
  *
+ * This plugin's parameters take effect only on Android 8+.
+ *
  * Shizuku versions below 11 are not supported, and with these versions uninstallations will fall back to normal
  * system's [PackageInstaller], or [INTENT_BASED] uninstaller (if was set).
  *
@@ -48,15 +50,15 @@ public class ShizukuUninstallPlugin private constructor() : AckpinePlugin<Shizuk
 		if (Shizuku.isPreV11()) {
 			return
 		}
-		builder.uninstallerType = UninstallerType.PACKAGE_INSTALLER_BASED
+		builder.setUninstallerType(UninstallerType.PACKAGE_INSTALLER_BASED)
 	}
 
 	override fun equals(other: Any?): Boolean = this === other || other is ShizukuUninstallPlugin
 	override fun hashCode(): Int = id.hashCode()
 	override fun toString(): String = "ShizukuUninstallPlugin"
 
 	/**
-	 * Parameters for [ShizukuUninstallPlugin].
+	 * Parameters for [ShizukuUninstallPlugin]. Take effect only on Android 8+.
 	 */
 	public class Parameters private constructor(