Skip to content

Commit

Permalink
Dynamic props fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Krystian Panek committed Aug 21, 2020
1 parent 65d6060 commit 62a5a75
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ tasks {
dependsOn("classes")
from(sourceSets["main"].allSource)
}
register<DokkaTask>("dokkaJavadoc") {
outputFormat = "html"
dokkaJavadoc {
outputDirectory = "$buildDir/javadoc"
}
register<Jar>("javadocJar") {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version=5.0.5
release.useAutomaticVersion=true

kotlin.version=1.3.71
dokka.version=0.9.18
kotlin.version=1.4.0
dokka.version=1.4.0-rc
detekt.version=1.6.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
7 changes: 6 additions & 1 deletion src/main/kotlin/com/neva/gradle/fork/config/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.neva.gradle.fork.config.properties.*
import com.neva.gradle.fork.config.rule.*
import com.neva.gradle.fork.gui.PropertyDialog
import com.neva.gradle.fork.template.TemplateEngine
import org.apache.commons.io.FilenameUtils
import org.gradle.api.Action
import org.gradle.api.file.FileTree
import java.io.File
Expand Down Expand Up @@ -103,7 +104,11 @@ abstract class Config(val fork: ForkExtension, val name: String) {
}

private fun promptDynamicProperties() {
fork.propertyDefinitions.all.filter { it.dynamic }.forEach { promptProp(it.name) }
fork.propertyDefinitions.all.filter { definition ->
definition.dynamic.any { configPattern -> FilenameUtils.wildcardMatch(this.name, configPattern) }
}.forEach {
promptProp(it.name)
}
}

fun renderTemplate(template: String) = templateEngine.render(template, promptedProperties)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class PropertyDefinition @Inject constructor(val name: String) {

var required = true

var dynamic = false
var dynamic = listOf<String>("*")

var controller: Property.() -> Unit = {}

Expand Down Expand Up @@ -53,8 +53,8 @@ open class PropertyDefinition @Inject constructor(val name: String) {
required = false
}

fun dynamic() {
dynamic = true
fun dynamic(vararg configs: String) {
dynamic = configs.toList()
}

fun controller(action: Action<in Property>) {
Expand Down

0 comments on commit 62a5a75

Please sign in to comment.