Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ import com.itsaky.androidide.plugins.tasks.AddFileToAssetsTask
import com.itsaky.androidide.plugins.tasks.GenerateInitScriptTask
import com.itsaky.androidide.plugins.tasks.GradleWrapperGeneratorTask
import com.itsaky.androidide.plugins.util.capitalized
import org.adfa.constants.GRADLE_DISTRIBUTION_VERSION
import org.gradle.api.GradleException
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.file.RegularFile
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.bundling.Jar
import org.gradle.api.tasks.wrapper.Wrapper
import org.gradle.kotlin.dsl.register

/**
Expand All @@ -43,11 +45,25 @@ import org.gradle.kotlin.dsl.register
class AndroidIDEAssetsPlugin : Plugin<Project> {
override fun apply(target: Project) {
target.run {
val wrapperFilesDirectory = layout.buildDirectory.dir("intermediates/gradle-wrapper")
val wrapperFilesTaskProvider =
tasks.register("generateGradleWrapperFiles", Wrapper::class.java) {
val directory = wrapperFilesDirectory.get().asFile
setScriptFile(directory.resolve("gradlew"))
setJarFile(directory.resolve("gradle/wrapper/gradle-wrapper.jar"))
gradleVersion = GRADLE_DISTRIBUTION_VERSION
distributionType = Wrapper.DistributionType.BIN
networkTimeout.set(10_000)
validateDistributionUrl.set(false)
}

val wrapperGeneratorTaskProvider =
tasks.register(
"generateGradleWrapper",
GradleWrapperGeneratorTask::class.java,
)
) {
wrapperDirectory.fileProvider(wrapperFilesTaskProvider.map { it.scriptFile.parentFile })
}

val androidComponentsExtension =
extensions.getByType(ApplicationAndroidComponentsExtension::class.java)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,10 @@ fun Project.configureAndroidModule(coreLibDesugDep: Provider<MinimalExternalModu
}

extensions.getByType(CommonExtension::class.java).run {
lint {
checkDependencies = true
}
lint.checkDependencies = true

packaging {
resources {
packaging.run {
resources.run {
excludes.addAll(
arrayOf(
"META-INF/CHANGES",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,74 +17,67 @@

package com.itsaky.androidide.plugins.tasks

import org.adfa.constants.GRADLE_DISTRIBUTION_VERSION
import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.PathSensitivity
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.wrapper.Wrapper
import java.io.File
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream

/**
* Generates the `gradle-wrapper.zip` file.
* Generates the `gradle-wrapper.zip` file from the files a Gradle `Wrapper` task wrote to
* [wrapperDirectory], leaving out `gradlew.bat`.
*
* @author Akash Yadav
*/
abstract class GradleWrapperGeneratorTask : DefaultTask() {
/**
* The directory holding `gradlew` and `gradle/wrapper/`.
*/
@get:InputDirectory
@get:PathSensitive(PathSensitivity.RELATIVE)
abstract val wrapperDirectory: DirectoryProperty

/**
* The output directory.
*/
@get:OutputDirectory
abstract val outputDirectory: DirectoryProperty
/**
* The output directory.
*/
@get:OutputDirectory
abstract val outputDirectory: DirectoryProperty

//TODO change gradle version to constants.LOCAL_GRADLE_DISTRIBUTION_VERSION
@TaskAction
fun generateGradleWrapperZip() {
val outputDirectory = this.outputDirectory.get().file("data/common").asFile
outputDirectory.mkdirs()
@TaskAction
fun generateGradleWrapperZip() {
val wrapperDirectory = this.wrapperDirectory.get().asFile
val outputDirectory =
this.outputDirectory
.get()
.file("data/common")
.asFile
outputDirectory.mkdirs()

val destFile = outputDirectory.resolve("gradle-wrapper.zip")
val destFile = outputDirectory.resolve("gradle-wrapper.zip")

if (destFile.exists()) {
destFile.delete()
}
if (destFile.exists()) {
destFile.delete()
}

val stagingDir = File(outputDirectory, "staging")
if (stagingDir.exists()) {
stagingDir.deleteRecursively()
}
stagingDir.mkdirs()
ZipOutputStream(destFile.outputStream().buffered()).use { zipOut ->
wrapperDirectory
.walk(direction = FileWalkDirection.TOP_DOWN)
.filter { it.isFile }
.forEach { file ->
if (file.name != "gradlew.bat") {
val entry = ZipEntry(file.relativeTo(wrapperDirectory).path)
zipOut.putNextEntry(entry)
file.inputStream().buffered().use { fileInStream ->
fileInStream.transferTo(zipOut)
}
}
}

// Generate the files
val generator = IDEWrapperGenerator()
generator.jarFile = File(stagingDir, "gradle/wrapper/gradle-wrapper.jar")
generator.scriptFile = File(stagingDir, "gradlew")
generator.gradleVersion = GRADLE_DISTRIBUTION_VERSION
generator.distributionType = Wrapper.DistributionType.BIN

generator.generate(project)

// Archive all generated files
ZipOutputStream(destFile.outputStream().buffered()).use { zipOut ->
stagingDir.walk(direction = FileWalkDirection.TOP_DOWN)
.filter { it.isFile }
.forEach { file ->
if (file.name != "gradlew.bat") {
val entry = ZipEntry(file.relativeTo(stagingDir).path)
zipOut.putNextEntry(entry)
file.inputStream().buffered().use { fileInStream ->
fileInStream.transferTo(zipOut)
}
}
}

zipOut.flush()
}

// finally, delete the staging directory
stagingDir.deleteRecursively()
}
}
zipOut.flush()
}
}
}
Loading
Loading