removed versionCode and versionName from library manifest merging.
ability to set versionCode and versionName for libraries has been
removed in the variant API as it made no sense for aar files.
removed setting the versionCode and versionName from the library
manifest merging.
Test: Existing.
Bug: N/A
Change-Id: Id2cb3a7291345c14659e3ee1cb7dd517a933344b
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/manifest/ManifestHelper.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/manifest/ManifestHelper.kt
index c1b2e28..b979f49 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/manifest/ManifestHelper.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/manifest/ManifestHelper.kt
@@ -31,7 +31,7 @@
import java.io.IOException
/** Invoke the Manifest Merger version 2. */
-fun mergeManifestsForApplication(
+fun mergeManifests(
mainManifest: File,
manifestOverlays: List<File>,
dependencies: List<ManifestProvider>,
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessApplicationManifest.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessApplicationManifest.kt
index 72acf40..1470cb3 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessApplicationManifest.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessApplicationManifest.kt
@@ -29,7 +29,7 @@
import com.android.build.gradle.internal.scope.InternalArtifactType.MANIFEST_MERGE_REPORT
import com.android.build.gradle.internal.scope.InternalArtifactType.NAVIGATION_JSON
import com.android.build.gradle.internal.tasks.factory.VariantTaskCreationAction
-import com.android.build.gradle.internal.tasks.manifest.mergeManifestsForApplication
+import com.android.build.gradle.internal.tasks.manifest.mergeManifests
import com.android.build.gradle.internal.utils.setDisallowChanges
import com.android.build.gradle.options.BooleanOption
import com.android.build.gradle.tasks.ProcessApplicationManifest.CreationAction.ManifestProviderImpl
@@ -143,7 +143,7 @@
}
val navJsons = navigationJsons?.files ?: setOf()
- val mergingReport = mergeManifestsForApplication(
+ val mergingReport = mergeManifests(
mainManifest.get(),
manifestOverlays.get(),
computeFullProviderList(),
@@ -519,4 +519,4 @@
else EnumSet.copyOf(features)
}
}
-}
\ No newline at end of file
+}
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessLibraryManifest.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessLibraryManifest.kt
index 76792b5..ce9bb76 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessLibraryManifest.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessLibraryManifest.kt
@@ -28,8 +28,7 @@
import com.android.build.gradle.internal.scope.InternalArtifactType
import com.android.build.gradle.internal.scope.InternalArtifactType.MANIFEST_MERGE_REPORT
import com.android.build.gradle.internal.tasks.factory.VariantTaskCreationAction
-import com.android.build.gradle.internal.tasks.manifest.mergeManifestsForApplication
-import com.android.build.gradle.internal.utils.setDisallowChanges
+import com.android.build.gradle.internal.tasks.manifest.mergeManifests
import com.android.manifmerger.ManifestMerger2
import com.android.manifmerger.MergingReport
import com.android.utils.FileUtils
@@ -66,14 +65,6 @@
@get:Input
abstract val packageOverride: Property<String>
- @get:Input
- @get:Optional
- abstract val versionCode: Property<Int?>
-
- @get:Optional
- @get:Input
- abstract val versionName: Property<String?>
-
@get:PathSensitive(PathSensitivity.RELATIVE)
@get:InputFiles
abstract val manifestOverlays: ListProperty<File>
@@ -95,7 +86,6 @@
@get:Optional
@get:OutputDirectory
abstract val aaptFriendlyManifestOutputDirectory: DirectoryProperty
-
/**
* The aapt friendly processed Manifest. In case we are processing a library manifest, some
* placeholders may not have been resolved (and will be when the library is merged into the
@@ -125,8 +115,6 @@
it.mainManifest.set(mainManifest.get())
it.manifestOverlays.set(manifestOverlays)
it.packageOverride.set(packageOverride)
- it.versionCode.set(versionCode)
- it.versionName.set(versionName)
it.minSdkVersion.set(minSdkVersion)
it.targetSdkVersion.set(targetSdkVersion)
it.maxSdkVersion.set(maxSdkVersion)
@@ -147,8 +135,6 @@
abstract val mainManifest: RegularFileProperty
abstract val manifestOverlays: ListProperty<File>
abstract val packageOverride: Property<String>
- abstract val versionCode: Property<Int>
- abstract val versionName: Property<String>
abstract val minSdkVersion: Property<String>
abstract val targetSdkVersion: Property<String>
abstract val maxSdkVersion: Property<Int>
@@ -167,13 +153,13 @@
if (parameters.namespaced.get()) listOf(
ManifestMerger2.Invoker.Feature.FULLY_NAMESPACE_LOCAL_RESOURCES
) else emptyList()
- val mergingReport = mergeManifestsForApplication(
+ val mergingReport = mergeManifests(
parameters.mainManifest.asFile.get(),
parameters.manifestOverlays.get(), emptyList(), emptyList(),
null,
parameters.packageOverride.get(),
- parameters.versionCode.orNull,
- parameters.versionName.orNull,
+ null,
+ null,
parameters.minSdkVersion.orNull,
parameters.targetSdkVersion.orNull,
parameters.maxSdkVersion.orNull,
@@ -325,8 +311,6 @@
task.mainSplit.disallowChanges()
task.isNamespaced =
creationConfig.globalScope.extension.aaptOptions.namespaced
- task.versionName.setDisallowChanges(variantDslInfo.versionName)
- task.versionCode.setDisallowChanges(variantDslInfo.versionCode)
task.packageOverride.set(creationConfig.applicationId)
task.packageOverride.disallowChanges()
task.manifestPlaceholders.set(
@@ -344,4 +328,4 @@
task.manifestOverlays.disallowChanges()
}
}
-}
\ No newline at end of file
+}
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessMultiApkApplicationManifest.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessMultiApkApplicationManifest.kt
index 8b9fcc5..a9e036b 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessMultiApkApplicationManifest.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ProcessMultiApkApplicationManifest.kt
@@ -27,7 +27,7 @@
import com.android.build.gradle.internal.component.ApkCreationConfig
import com.android.build.gradle.internal.scope.InternalArtifactType
import com.android.build.gradle.internal.tasks.factory.VariantTaskCreationAction
-import com.android.build.gradle.internal.tasks.manifest.mergeManifestsForApplication
+import com.android.build.gradle.internal.tasks.manifest.mergeManifests
import com.android.build.gradle.internal.utils.setDisallowChanges
import com.android.manifmerger.ManifestMerger2
import com.android.utils.FileUtils
@@ -128,7 +128,7 @@
return mergedManifestOutputFile
}
}
- mergeManifestsForApplication(
+ mergeManifests(
mainMergedManifest.get().asFile,
if (compatibleScreensManifestFilePath != null)
listOf(File(compatibleScreensManifestFilePath))
@@ -198,4 +198,4 @@
task.applicationId.setDisallowChanges(creationConfig.applicationId)
}
}
-}
\ No newline at end of file
+}
diff --git a/build-system/gradle-core/src/test/java/com/android/build/gradle/tasks/ProcessLibraryManifestTest.kt b/build-system/gradle-core/src/test/java/com/android/build/gradle/tasks/ProcessLibraryManifestTest.kt
index a7c1fe2..7c0e850 100644
--- a/build-system/gradle-core/src/test/java/com/android/build/gradle/tasks/ProcessLibraryManifestTest.kt
+++ b/build-system/gradle-core/src/test/java/com/android/build/gradle/tasks/ProcessLibraryManifestTest.kt
@@ -47,8 +47,6 @@
task.minSdkVersion.set("1")
task.maxSdkVersion.set(1)
task.targetSdkVersion.set("1")
- task.versionCode.set(1)
- task.versionName.set("versionName")
task.packageOverride.set("packageOverride")
task.manifestPlaceholders.set(mapOf())
task.mainSplit.set(
@@ -68,10 +66,8 @@
assertThat(task.inputs.properties).containsKey("maxSdkVersion")
assertThat(task.inputs.properties).containsKey("minSdkVersion")
assertThat(task.inputs.properties).containsKey("targetSdkVersion")
- assertThat(task.inputs.properties).containsKey("versionCode")
- assertThat(task.inputs.properties).containsKey("versionName")
assertThat(task.inputs.properties).containsKey("manifestPlaceholders")
assertThat(task.inputs.properties).containsKey("packageOverride")
assertThat(task.inputs.properties).containsEntry("mainSplit.fullName", "fooRelease")
}
-}
\ No newline at end of file
+}
