-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MBS-9086 Basic AGP 4.1 support (#632)
- Loading branch information
1 parent
1ca576f
commit fd49b29
Showing
21 changed files
with
280 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| -dontobfuscate | ||
|
|
||
| # Workaround for shrinked R class in test code: https://github.com/slackhq/keeper/issues/22 | ||
| # Consuming the same rules from ui-testing-core is not enough. We need them in a regular APK not a test one. | ||
| -keep class com.google.android.material.R$id { *; } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Workaround for shrinked R class in test code: https://github.com/slackhq/keeper/issues/22 | ||
| -keep class com.google.android.material.R$id { *; } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
subprojects/gradle/android/src/main/kotlin/com/avito/android/ApplicationVariantExtensions.kt
This file was deleted.
Oops, something went wrong.
29 changes: 24 additions & 5 deletions
29
...ects/gradle/android/src/main/kotlin/com/avito/android/PackageAndroidArtifactExtensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,33 @@ | ||
| package com.avito.android | ||
|
|
||
| import com.android.build.gradle.tasks.PackageAndroidArtifact | ||
| import org.gradle.api.file.Directory | ||
| import org.gradle.api.file.DirectoryProperty | ||
| import java.io.File | ||
|
|
||
| fun PackageAndroidArtifact.getApkFile(): File { | ||
| require(apkNames.size == 1) { | ||
| "Cannot get apk from $name android artifact task because apkNames.size != 1 ($apkNames). Split apk is not supported." | ||
| // TODO: Use Artifacts API | ||
| fun PackageAndroidArtifact.apkDirectory(): DirectoryProperty = outputDirectory | ||
|
|
||
| fun Directory.getApk(): File? { | ||
| val dir = asFile | ||
| val apks = dir.listFiles().orEmpty() | ||
| .filter { | ||
| it.extension == "apk" | ||
| } | ||
|
|
||
| require(apks.size < 2) { | ||
| "Multiple APK are not supported: ${dir.dumpFiles()}" | ||
| } | ||
| return apks.firstOrNull() | ||
| } | ||
|
|
||
| val outputDir = outputDirectory.get().asFile | ||
| fun Directory.getApkOrThrow(): File { | ||
| return requireNotNull(getApk()) { | ||
| "APK not found in ${asFile}. Files in dir: ${asFile.dumpFiles()}" | ||
| } | ||
| } | ||
|
|
||
| return File(outputDir, apkNames.first()) | ||
| private fun File.dumpFiles(): String { | ||
| return listFiles().orEmpty() | ||
| .joinToString(prefix = "[", postfix = "]") { it.path } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignApkTask.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.avito.plugin | ||
|
|
||
| import com.avito.android.getApkOrThrow | ||
| import org.gradle.api.file.DirectoryProperty | ||
| import org.gradle.api.model.ObjectFactory | ||
| import org.gradle.api.tasks.InputDirectory | ||
| import org.gradle.api.tasks.OutputDirectory | ||
| import java.io.File | ||
| import javax.inject.Inject | ||
|
|
||
| @Suppress("UnstableApiUsage") | ||
| abstract class SignApkTask @Inject constructor(objects: ObjectFactory) : SignArtifactTask(objects) { | ||
|
|
||
| @InputDirectory | ||
| val unsignedDirProperty: DirectoryProperty = objects.directoryProperty() | ||
|
|
||
| @OutputDirectory | ||
| val signedDirProperty: DirectoryProperty = objects.directoryProperty() | ||
|
|
||
| override fun unsignedFile(): File { | ||
| return unsignedDirProperty.get().getApkOrThrow() | ||
| } | ||
|
|
||
| override fun signedFile(): File { | ||
| return File(signedDirProperty.get().asFile, signedFileName()) | ||
| } | ||
|
|
||
| private fun signedFileName(): String { | ||
| val unsignedFile = unsignedFile() | ||
|
|
||
| val name = unsignedFile.nameWithoutExtension.removeSuffix("-unsigned") | ||
| val extension = unsignedFile.extension | ||
|
|
||
| return "$name.$extension" | ||
| } | ||
|
|
||
| override fun hackForArtifactsApi() { | ||
| val signedFile = signedFile() | ||
| val copyOfSigned = File(unsignedDirProperty.get().asFile, signedFileName()) | ||
| if (!copyOfSigned.exists()) { | ||
| copyOfSigned.createNewFile() | ||
| } | ||
| signedFile.copyTo(copyOfSigned, overwrite = true) | ||
| } | ||
| } |
Oops, something went wrong.