mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 18:56:44 -04:00
Fixed Auth.kt file using some deprecated method
This commit is contained in:
parent
8c20953b5d
commit
aa86a88acb
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package custom
|
package custom
|
||||||
|
|
||||||
import com.android.build.api.variant.VariantOutput
|
|
||||||
import com.android.build.gradle.api.ApkVariantOutput
|
import com.android.build.gradle.api.ApkVariantOutput
|
||||||
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
|
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
|
||||||
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
|
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
|
||||||
@ -34,6 +33,7 @@ import java.io.File
|
|||||||
import java.io.FileInputStream
|
import java.io.FileInputStream
|
||||||
import java.security.KeyStore
|
import java.security.KeyStore
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
fun createPublisher(auth: File): AndroidPublisher {
|
fun createPublisher(auth: File): AndroidPublisher {
|
||||||
val transport = buildTransport()
|
val transport = buildTransport()
|
||||||
val factory = JacksonFactory.getDefaultInstance()
|
val factory = JacksonFactory.getDefaultInstance()
|
||||||
@ -81,6 +81,7 @@ class Transaction(
|
|||||||
FileContent("application/octet-stream", file)
|
FileContent("application/octet-stream", file)
|
||||||
).execute().prettyPrint()
|
).execute().prettyPrint()
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
fun attachExpansionTo(expansionCode: Int, apkVariantOutput: ApkVariantOutput): ExpansionFile =
|
fun attachExpansionTo(expansionCode: Int, apkVariantOutput: ApkVariantOutput): ExpansionFile =
|
||||||
publisher.edits().expansionfiles().update(
|
publisher.edits().expansionfiles().update(
|
||||||
packageName,
|
packageName,
|
||||||
@ -90,6 +91,7 @@ class Transaction(
|
|||||||
ExpansionFile().apply { referencesVersion = expansionCode }
|
ExpansionFile().apply { referencesVersion = expansionCode }
|
||||||
).execute().prettyPrint()
|
).execute().prettyPrint()
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
fun uploadApk(apkVariantOutput: ApkVariantOutput) {
|
fun uploadApk(apkVariantOutput: ApkVariantOutput) {
|
||||||
publisher.edits().apks().upload(
|
publisher.edits().apks().upload(
|
||||||
packageName,
|
packageName,
|
||||||
@ -98,6 +100,7 @@ class Transaction(
|
|||||||
).execute().prettyPrint()
|
).execute().prettyPrint()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
fun addToTrackInDraft(apkVariants: List<ApkVariantOutput>): Track =
|
fun addToTrackInDraft(apkVariants: List<ApkVariantOutput>): Track =
|
||||||
publisher.edits().tracks().update(packageName, editId, "internal", Track().apply {
|
publisher.edits().tracks().update(packageName, editId, "internal", Track().apply {
|
||||||
releases = listOf(TrackRelease().apply {
|
releases = listOf(TrackRelease().apply {
|
||||||
|
@ -73,6 +73,7 @@ class AppConfigurer {
|
|||||||
* for APKs).
|
* for APKs).
|
||||||
*/
|
*/
|
||||||
applicationVariants.all {
|
applicationVariants.all {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
outputs.filterIsInstance<ApkVariantOutput>().forEach { output: ApkVariantOutput ->
|
outputs.filterIsInstance<ApkVariantOutput>().forEach { output: ApkVariantOutput ->
|
||||||
val abiVersionCode = abiCodes[output.getFilter(VariantOutput.FilterType.ABI)] ?: 7
|
val abiVersionCode = abiCodes[output.getFilter(VariantOutput.FilterType.ABI)] ?: 7
|
||||||
output.versionCodeOverride = abiVersionCode * 1_000_000 + output.versionCode
|
output.versionCodeOverride = abiVersionCode * 1_000_000 + output.versionCode
|
||||||
|
@ -7,6 +7,7 @@ import custom.transactionWithCommit
|
|||||||
import plugin.KiwixConfigurationPlugin
|
import plugin.KiwixConfigurationPlugin
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
android
|
android
|
||||||
@ -37,7 +38,13 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun ProductFlavor.createDownloadTask(file: File): Task {
|
fun ProductFlavor.createDownloadTask(file: File): Task {
|
||||||
return tasks.create("download${name.capitalize()}Zim") {
|
return tasks.create(
|
||||||
|
"download${
|
||||||
|
name.replaceFirstChar {
|
||||||
|
if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else "$it"
|
||||||
|
}
|
||||||
|
}Zim"
|
||||||
|
) {
|
||||||
group = "Downloading"
|
group = "Downloading"
|
||||||
doLast {
|
doLast {
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
@ -65,7 +72,8 @@ fun ProductFlavor.createPublishApkWithExpansionTask(
|
|||||||
file: File,
|
file: File,
|
||||||
applicationVariants: DomainObjectSet<ApplicationVariant>
|
applicationVariants: DomainObjectSet<ApplicationVariant>
|
||||||
): Task {
|
): Task {
|
||||||
val capitalizedName = name.capitalize()
|
val capitalizedName =
|
||||||
|
name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else "$it" }
|
||||||
return tasks.create("publish${capitalizedName}ReleaseApkWithExpansionFile") {
|
return tasks.create("publish${capitalizedName}ReleaseApkWithExpansionFile") {
|
||||||
group = "publishing"
|
group = "publishing"
|
||||||
description = "Uploads $capitalizedName to the Play Console with an Expansion file"
|
description = "Uploads $capitalizedName to the Play Console with an Expansion file"
|
||||||
@ -85,6 +93,7 @@ fun ProductFlavor.createPublishApkWithExpansionTask(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
fun DomainObjectSet<ApplicationVariant>.releaseVariantsFor(productFlavor: ProductFlavor) =
|
fun DomainObjectSet<ApplicationVariant>.releaseVariantsFor(productFlavor: ProductFlavor) =
|
||||||
find { it.name.equals("${productFlavor.name}Release", true) }!!
|
find { it.name.equals("${productFlavor.name}Release", true) }!!
|
||||||
.outputs.filterIsInstance<ApkVariantOutput>().sortedBy { it.versionCodeOverride }
|
.outputs.filterIsInstance<ApkVariantOutput>().sortedBy { it.versionCodeOverride }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user