Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the project isolation issues #1145

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Fix the project isolation issues #1145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a80e1
Fix the project isolation issues
ansman Sep 4, 2024
c89b1bc
Fix the build error
ansman Sep 6, 2024
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
14 changes: 0 additions & 14 deletions ...on/src/main/kotlin/com/github/triplet/gradle/common/validation/RuntimeValidationPlugin.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/Validation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import org.gradle.api.logging.Logger
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.findByType
import org.gradle.kotlin.dsl.withType
import org.gradle.util.GradleVersion

/**
* Validates required dependencies. If GPP can't run in the current context, an error will be
* thrown.
*/
fun Project.validateRuntime() {
rootProject.plugins.apply(RuntimeValidationPlugin::class)

project.plugins.withType<AppPlugin> {
GradleRuntimeValidator(GradleVersion.current(), MIN_GRADLE_VERSION).validate()
plugins.withType<AppPlugin> {
ansman marked this conversation as resolved.
Show resolved Hide resolved
val agpPluginVersion = extensions.findByType<ApplicationAndroidComponentsExtension>()?.pluginVersion
AgpRuntimeValidator(agpPluginVersion, MIN_AGP_VERSION).validate()
}
Expand Down
2 changes: 1 addition & 1 deletion play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ internal abstract class PlayPublisherPlugin @Inject constructor(
}

private fun applyInternal(project: Project) {
val executionDir = project.rootProject.layout.projectDirectory
val executionDir = project.rootDir
val cliOptionsExtension = project.objects.newInstance<CliPlayPublisherExtension>()
val bootstrapOptionsHolder = BootstrapOptions.Holder()

Expand Down
Loading