Merge pull request #130 from solrudev/develop

0.14.0

Author: solrudev

README.md

@@ -35,7 +35,7 @@ Ackpine depends on Jetpack libraries, so it's also necessary to add the `google(
 
 ```toml
 [versions]
-ackpine = "0.13.2"
+ackpine = "0.14.0"
 
 [libraries]
 ackpine-core = { module = "ru.solrudev.ackpine:ackpine-core", version.ref = "ackpine" }
@@ -76,7 +76,7 @@ ackpine = [
 
 ```kotlin
 dependencies {
-    val ackpineVersion = "0.13.2"
+    val ackpineVersion = "0.14.0"
     implementation("ru.solrudev.ackpine:ackpine-core:$ackpineVersion")
 
     // optional - Kotlin extensions and Coroutines support

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

@@ -270,6 +270,7 @@ public final class ru/solrudev/ackpine/installer/parameters/InstallParameters :
 	public final fun getName ()Ljava/lang/String;
 	public fun getNotificationData ()Lru/solrudev/ackpine/session/parameters/NotificationData;
 	public final fun getPackageSource ()Lru/solrudev/ackpine/installer/parameters/PackageSource;
+	public final fun getPluginContainer ()Lru/solrudev/ackpine/plugability/AckpinePluginContainer;
 	public final fun getPlugins ()Lru/solrudev/ackpine/plugability/AckpinePluginContainer;
 	public final fun getPreapproval ()Lru/solrudev/ackpine/installer/parameters/InstallPreapproval;
 	public final fun getRequestUpdateOwnership ()Z

ackpine-api/api-main/consumer-rules.pro

@@ -2,11 +2,11 @@
 -keep interface ru.solrudev.ackpine.session.parameters.DrawableId { *; }
 -keep class * implements ru.solrudev.ackpine.session.parameters.DrawableId { *; }
 -keep class ru.solrudev.ackpine.installer.InstallFailure { *; }
--keep class ru.solrudev.ackpine.installer.InstallFailure$* { *; }
--keep class ru.solrudev.ackpine.uninstaller.UninstallFailure { *; }
--keep class ru.solrudev.ackpine.uninstaller.UninstallFailure$* { *; }
--keep class ru.solrudev.ackpine.installer.parameters.InstallConstraints$TimeoutStrategy { *; }
--keep class ru.solrudev.ackpine.installer.parameters.InstallConstraints$TimeoutStrategy$* { *; }
+-keep class * extends ru.solrudev.ackpine.installer.InstallFailure { *; }
+-keep interface ru.solrudev.ackpine.uninstaller.UninstallFailure { *; }
+-keep class * implements ru.solrudev.ackpine.uninstaller.UninstallFailure { *; }
+-keep interface ru.solrudev.ackpine.installer.parameters.InstallConstraints$TimeoutStrategy { *; }
+-keep class * implements ru.solrudev.ackpine.installer.parameters.InstallConstraints$TimeoutStrategy { *; }
 
 # Plugins
 -keep interface ru.solrudev.ackpine.plugability.AckpinePlugin { *; }

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/installer/parameters/InstallParameters.kt

@@ -24,6 +24,7 @@ import androidx.annotation.RequiresApi
 import ru.solrudev.ackpine.DelicateAckpineApi
 import ru.solrudev.ackpine.exceptions.SplitPackagesNotSupportedException
 import ru.solrudev.ackpine.plugability.AckpinePlugin
+import ru.solrudev.ackpine.plugability.AckpinePluginCache
 import ru.solrudev.ackpine.plugability.AckpinePluginContainer
 import ru.solrudev.ackpine.session.parameters.Confirmation
 import ru.solrudev.ackpine.session.parameters.ConfirmationAware
@@ -134,9 +135,16 @@ public class InstallParameters private constructor(
 	/**
 	 * [Plugins][AckpinePlugin] applied to the install session.
 	 */
-	public val plugins: AckpinePluginContainer
+	public val pluginContainer: AckpinePluginContainer
 ) : ConfirmationAware {
 
+	/**
+	 * [Plugins][AckpinePlugin] applied to the install session.
+	 */
+	@Deprecated(message = "Renamed to pluginContainer", replaceWith = ReplaceWith(expression = "pluginContainer"))
+	public val plugins: AckpinePluginContainer
+		get() = pluginContainer
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
@@ -152,7 +160,7 @@ public class InstallParameters private constructor(
 		if (preapproval != other.preapproval) return false
 		if (constraints != other.constraints) return false
 		if (packageSource != other.packageSource) return false
-		if (plugins != other.plugins) return false
+		if (pluginContainer != other.pluginContainer) return false
 		return true
 	}
 
@@ -168,7 +176,7 @@ public class InstallParameters private constructor(
 		result = 31 * result + preapproval.hashCode()
 		result = 31 * result + constraints.hashCode()
 		result = 31 * result + packageSource.hashCode()
-		result = 31 * result + plugins.hashCode()
+		result = 31 * result + pluginContainer.hashCode()
 		return result
 	}
 
@@ -185,7 +193,7 @@ public class InstallParameters private constructor(
 				"constraints=$constraints, " +
 				"requestUpdateOwnership=$requestUpdateOwnership, " +
 				"packageSource=$packageSource, " +
-				"plugins=$plugins" +
+				"pluginContainer=$pluginContainer" +
 				")"
 	}
 
@@ -430,15 +438,15 @@ public class InstallParameters private constructor(
 			plugin: Class<out AckpinePlugin<Params>>,
 			parameters: Params
 		): Builder = apply {
-			plugins.put(plugin, parameters)
+			plugins[plugin] = parameters
 		}
 
 		/**
 		 * Applies a [plugin] to the session.
 		 * @param plugin Java class of an applied plugin, implementing [AckpinePlugin].
 		 */
 		public fun usePlugin(plugin: Class<out AckpinePlugin<AckpinePlugin.Parameters.None>>): Builder = apply {
-			plugins.put(plugin, AckpinePlugin.Parameters.None)
+			plugins[plugin] = AckpinePlugin.Parameters.None
 		}
 
 		/**
@@ -447,7 +455,10 @@ public class InstallParameters private constructor(
 		@SuppressLint("NewApi")
 		public fun build(): InstallParameters {
 			val pluginContainer = AckpinePluginContainer.from(plugins)
-			for (plugin in pluginContainer.getPluginInstances().keys) {
+			val pluginInstances = pluginContainer
+				.getPlugins()
+				.map { (pluginClass, _) -> AckpinePluginCache.get(pluginClass) }
+			for (plugin in pluginInstances) {
 				plugin.apply(this)
 			}
 			return InstallParameters(

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/plugability/AckpinePluginContainer.kt

@@ -16,35 +16,20 @@
 
 package ru.solrudev.ackpine.plugability
 
-import androidx.annotation.RestrictTo
-
 /**
  * A container of [AckpinePlugins][AckpinePlugin] applied to a session.
  */
 public class AckpinePluginContainer private constructor(
 	private val pluginsMap: Map<Class<out AckpinePlugin<*>>, AckpinePlugin.Parameters>
 ) {
 
-	private val pluginInstancesMap by lazy {
-		pluginsMap.mapKeys { (pluginClass, _) -> AckpinePluginCache.get(pluginClass) }
-	}
-
 	/**
 	 * Returns a new copy of plugin entries saved inside of this container.
 	 */
 	public fun getPlugins(): Map<Class<out AckpinePlugin<*>>, AckpinePlugin.Parameters> {
 		return pluginsMap.toMap()
 	}
 
-	/**
-	 * Returns a map of plugin instances with their parameters saved inside of this container.
-	 */
-	@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-	@JvmSynthetic
-	public fun getPluginInstances(): Map<AckpinePlugin<*>, AckpinePlugin.Parameters> {
-		return pluginInstancesMap.toMap()
-	}
-
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (other !is AckpinePluginContainer) return false

ackpine-api/api-stubs/src/main/kotlin/ru/solrudev/ackpine/impl/installer/PackageInstallerImpl.kt

@@ -23,7 +23,7 @@ import ru.solrudev.ackpine.installer.PackageInstaller
  * Stub for `PackageInstallerImpl` from `ackpine-core`.
  */
 public class PackageInstallerImpl : PackageInstaller {
-	public companion object Companion {
+	public companion object {
 		public fun getInstance(context: Context): PackageInstallerImpl {
 			throw NotImplementedError()
 		}

ackpine-core/build.gradle.kts

@@ -33,7 +33,7 @@ ackpine {
 }
 
 room {
-	schemaDirectory("$projectDir/schemas")
+	schemaDirectory(layout.projectDirectory.dir("schemas"))
 }
 
 dependencies {

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/InstallSessionFactory.kt

@@ -47,6 +47,7 @@ import ru.solrudev.ackpine.installer.parameters.InstallParameters
 import ru.solrudev.ackpine.installer.parameters.InstallerType
 import ru.solrudev.ackpine.installer.parameters.PackageSource
 import ru.solrudev.ackpine.plugability.AckpinePlugin
+import ru.solrudev.ackpine.plugability.AckpinePluginCache
 import ru.solrudev.ackpine.resources.ResolvableString
 import ru.solrudev.ackpine.session.Progress
 import ru.solrudev.ackpine.session.Session
@@ -115,7 +116,12 @@ internal class InstallSessionFactoryImpl internal constructor(
 
 		InstallerType.SESSION_BASED -> withPackageInstallerService(
 			id,
-			runCatching { parameters.plugins.getPluginInstances() }
+			runCatching {
+				parameters
+					.pluginContainer
+					.getPlugins()
+					.mapKeys { (pluginClass, _) -> AckpinePluginCache.get(pluginClass) }
+			}
 		) { packageInstallerService ->
 			SessionBasedInstallSession(
 				applicationContext,

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

@@ -49,7 +49,8 @@ public interface AckpineServiceProvider {
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class AbstractAckpineServiceProvider(
-	serviceFactories: Set<ServiceFactory<*>>
+	serviceFactories: Set<ServiceFactory<*>>,
+	override val pluginId: String
 ) : AckpineServiceProvider {
 
 	private val factories = serviceFactories.associate { it.serviceClass to it.serviceFactory }

ackpine-plugins/shizuku-stubs/build.gradle.kts

@@ -14,14 +14,18 @@
  * limitations under the License.
  */
 
-import ru.solrudev.ackpine.gradle.Constants
-
 description = "API stubs for ackpine-shizuku"
 
 plugins {
-	`java-library`
+	id("ru.solrudev.ackpine.library.base")
+}
+
+ackpine {
+	id = "shizuku-stubs"
 }
 
-java {
-	toolchain.languageVersion = JavaLanguageVersion.of(Constants.JDK_VERSION)
+dependencies {
+	annotationProcessor(libs.hiddenApiRefine.processor)
+	compileOnly(libs.hiddenApiRefine.annotation)
+	api(androidx.annotation)
 }