Merge pull request #135 from solrudev/develop

0.15.0

Author: solrudev

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Publish
         run: |
-          ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
+          ./gradlew publishAndReleaseToMavenCentral
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}

README.md

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

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

@@ -313,8 +313,9 @@ public final class ru/solrudev/ackpine/installer/parameters/InstallParameters$Bu
 public final class ru/solrudev/ackpine/installer/parameters/InstallPreapproval {
 	public static final field Companion Lru/solrudev/ackpine/installer/parameters/InstallPreapproval$Companion;
 	public static final field NONE Lru/solrudev/ackpine/installer/parameters/InstallPreapproval;
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFallbackToOnDemandApproval ()Z
 	public final fun getIcon ()Landroid/net/Uri;
 	public final fun getLabel ()Ljava/lang/String;
 	public final fun getLanguageTag ()Ljava/lang/String;
@@ -328,7 +329,9 @@ public final class ru/solrudev/ackpine/installer/parameters/InstallPreapproval$B
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)V
 	public final fun build ()Lru/solrudev/ackpine/installer/parameters/InstallPreapproval;
+	public final fun getFallbackToOnDemandApproval ()Z
 	public final fun getIcon ()Landroid/net/Uri;
+	public final fun setFallbackToOnDemandApproval (Z)Lru/solrudev/ackpine/installer/parameters/InstallPreapproval$Builder;
 	public final fun setIcon (Landroid/net/Uri;)Lru/solrudev/ackpine/installer/parameters/InstallPreapproval$Builder;
 }
 

ackpine-api/api-main/build.gradle.kts

@@ -31,7 +31,7 @@ ackpine {
 }
 
 dependencies {
-	api(libs.listenablefuture)
+	api(libs.listenableFuture)
 	api(androidx.annotation)
 	api(projects.ackpineResources)
 	compileOnly(projects.ackpineApi.apiStubs)

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

@@ -141,7 +141,11 @@ public class InstallParameters private constructor(
 	/**
 	 * [Plugins][AckpinePlugin] applied to the install session.
 	 */
-	@Deprecated(message = "Renamed to pluginContainer", replaceWith = ReplaceWith(expression = "pluginContainer"))
+	@Deprecated(
+		message = "Renamed to pluginContainer",
+		replaceWith = ReplaceWith(expression = "pluginContainer"),
+		level = DeprecationLevel.ERROR
+	)
 	public val plugins: AckpinePluginContainer
 		get() = pluginContainer
 

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

@@ -51,7 +51,12 @@ public class InstallPreapproval private constructor(
 	/**
 	 * The icon representing the app to be installed.
 	 */
-	public val icon: Uri
+	public val icon: Uri,
+
+	/**
+	 * If `true`, allows to fall back to normal on-demand user approval if preapproval is not available.
+	 */
+	public val fallbackToOnDemandApproval: Boolean
 ) {
 
 	override fun equals(other: Any?): Boolean {
@@ -62,6 +67,7 @@ public class InstallPreapproval private constructor(
 		if (label != other.label) return false
 		if (languageTag != other.languageTag) return false
 		if (icon != other.icon) return false
+		if (fallbackToOnDemandApproval != other.fallbackToOnDemandApproval) return false
 		return true
 	}
 
@@ -70,6 +76,7 @@ public class InstallPreapproval private constructor(
 		result = 31 * result + label.hashCode()
 		result = 31 * result + languageTag.hashCode()
 		result = 31 * result + icon.hashCode()
+		result = 31 * result + fallbackToOnDemandApproval.hashCode()
 		return result
 	}
 
@@ -78,7 +85,8 @@ public class InstallPreapproval private constructor(
 				"packageName='$packageName', " +
 				"label='$label', " +
 				"languageTag='$languageTag', " +
-				"icon=$icon" +
+				"icon=$icon, " +
+				"fallbackToOnDemandApproval=$fallbackToOnDemandApproval" +
 				")"
 	}
 
@@ -111,18 +119,31 @@ public class InstallPreapproval private constructor(
 		public var icon: Uri = Uri.EMPTY
 			private set
 
+		/**
+		 * If `true`, allows to fall back to normal on-demand user approval if preapproval is not available.
+		 */
+		public var fallbackToOnDemandApproval: Boolean = false
+			private set
+
 		/**
 		 * Sets [InstallPreapproval.icon].
 		 */
 		public fun setIcon(icon: Uri): Builder = apply {
 			this.icon = icon
 		}
 
+		/**
+		 * Sets [InstallPreapproval.fallbackToOnDemandApproval]
+		 */
+		public fun setFallbackToOnDemandApproval(value: Boolean): Builder = apply {
+			this.fallbackToOnDemandApproval = value
+		}
+
 		/**
 		 * Constructs a new instance of [InstallPreapproval].
 		 */
 		public fun build(): InstallPreapproval {
-			return InstallPreapproval(packageName, label, languageTag, icon)
+			return InstallPreapproval(packageName, label, languageTag, icon, fallbackToOnDemandApproval)
 		}
 	}
 
@@ -136,7 +157,8 @@ public class InstallPreapproval private constructor(
 			packageName = "",
 			label = "",
 			languageTag = "",
-			icon = Uri.EMPTY
+			icon = Uri.EMPTY,
+			fallbackToOnDemandApproval = false
 		)
 	}
 }

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

@@ -66,4 +66,12 @@ public enum class InstallerType {
 
 @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP)
 @JvmSynthetic
-internal fun areSplitPackagesSupported(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+internal fun areSplitPackagesSupported(): Boolean = isPackageInstallerAvailable
+
+// To avoid referencing Build.VERSION.SDK_INT
+private val isPackageInstallerAvailable = try {
+	Class.forName("android.content.pm.PackageInstaller")
+	true
+} catch (_: ClassNotFoundException) {
+	false
+}