Proton/protoncore_android
1
0
Fork 0
mirror of https://github.com/ProtonMail/protoncore_android.git synced 2026-05-15 09:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(include-core-build): Added Include Git Repo support.

Browse Source
This commit is contained in:
Neil Marietta
2022-11-18 17:15:56 +01:00
parent 294828ce57
commit cb8fc206ee
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/include-core-build/src/main/kotlin/ProtonIncludeCoreBuildExtension.kt
+31 -6
View File
@@ -14,6 +14,7 @@
* limitations under the License.
*/
import me.champeau.gradle.igp.GitIncludeExtension
import me.champeau.gradle.igp.IncludedGitRepo
import me.champeau.gradle.igp.internal.DefaultIncludeGitExtension
import org.gradle.api.Action
@@ -90,6 +91,14 @@ interface ProtonIncludeCoreBuildExtension {
*/
fun includeBuild(relativePath: String, spec: Action<ConfigurableIncludedBuild>)
/**
* Includes a Git repository as a Gradle included build.
*
* @param name the name of the included build.
* @param spec the configuration of the Git repository.
*/
fun includeRepo(name: String, spec: Action<IncludedGitRepo>)
companion object {
fun Settings.createExtension(): ProtonIncludeCoreBuildExtension = extensions.create(
ProtonIncludeCoreBuildExtension::class.java,
@@ -110,25 +119,30 @@ abstract class DefaultProtonIncludeCoreBuildExtension @Inject constructor(
@Inject
protected abstract fun getProviders(): ProviderFactory
private val includes: MutableList<IncludedBuild> = mutableListOf()
private val includedBuilds: MutableList<IncludedBuild> = mutableListOf()
private val includedRepos: MutableList<IncludedRepo> = mutableListOf()
override fun includeBuild(spec: Action<ConfigurableIncludedBuild>) {
includeBuild(".") { spec.execute(this) }
}
override fun includeBuild(relativePath: String, spec: Action<ConfigurableIncludedBuild>) {
includes.add(IncludedBuild(relativePath, spec));
includedBuilds.add(IncludedBuild(relativePath, spec));
}
override fun includeRepo(name: String, spec: Action<IncludedGitRepo>) {
includedRepos.add(IncludedRepo(name, spec));
}
private fun isLocalPresent() = with(getProviders()) {
gradleProperty(localRepoProperty).orElse(systemProperty(localRepoProperty)).isPresent
}
fun hasIncludes() = includes.isNotEmpty() ||
fun hasIncludedBuilds() = includedBuilds.isNotEmpty() ||
isLocalPresent() ||
branch.isPresent || tag.isPresent || commit.isPresent
fun configure(includedGitRepo: IncludedGitRepo) {
fun configureCoreBuild(includedGitRepo: IncludedGitRepo) {
when {
isLocalPresent() -> return
branch.isPresent -> includedGitRepo.branch.set(branch.get())
@@ -136,18 +150,29 @@ abstract class DefaultProtonIncludeCoreBuildExtension @Inject constructor(
commit.isPresent -> includedGitRepo.commit.set(commit.get())
}
for (include in includes) {
for (include in includedBuilds) {
includedGitRepo.includeBuild(include.directory, include.spec)
}
}
fun configureIncludedGitRepos(gitIncludeExtension: GitIncludeExtension) {
for (include in includedRepos) {
gitIncludeExtension.include(include.name, include.spec)
}
}
data class IncludedBuild(
val directory: String,
val spec: Action<ConfigurableIncludedBuild>,
)
data class IncludedRepo(
val name: String,
val spec: Action<IncludedGitRepo>,
)
companion object {
private const val localRepoProperty =
DefaultIncludeGitExtension.LOCAL_GIT_PREFIX + ProtonIncludeCoreBuildPlugin.repoDir
DefaultIncludeGitExtension.LOCAL_GIT_PREFIX + ProtonIncludeCoreBuildPlugin.coreRepoDir
}
}
plugins/include-core-build/src/main/kotlin/ProtonIncludeCoreBuildPlugin.kt
+7 -5
View File
@@ -49,22 +49,24 @@ abstract class ProtonIncludeCoreBuildPlugin : Plugin<Settings> {
checkoutsDirectory.set(target.rootDir.parentFile)
when {
metaProperties.exists() -> includeBuild(parentRepoDir)
commitSha != null -> include(repoDir) {
commitSha != null -> include(coreRepoDir) {
uri.set(protonLibsUri)
commit.set(commitSha)
}
config.hasIncludes() -> include(repoDir) {
config.hasIncludedBuilds() -> include(coreRepoDir) {
uri.set(protonLibsUri)
config.configure(this)
config.configureCoreBuild(this)
}
}
// Configuration of additional IncludedGitRepo.
config.configureIncludedGitRepos(this)
}
}
}
companion object {
const val repoDir = "proton-libs"
const val parentRepoDir = "../$repoDir"
const val coreRepoDir = "proton-libs"
const val parentRepoDir = "../$coreRepoDir"
const val metaProperties = "meta.properties"
}
}