Commits

shemnon committed 387e632

move dname and validity out of the convention, it is a very rare scenario best done by hand anyway.

  • Participants
  • Parent commits 2ea07c0

Comments (0)

Files changed (2)

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/JavaFXPlugin.groovy

                 packaging = 'all'
                 debugKey {
                     alias = 'javafxdebugkey'
-                    dname = 'CN=JavaFX Gradle Plugin Default Debug Key, O=JavaFX Debug'
-                    validity = ((365.25) * 25 as int) // 25 years
                     keypass = 'JavaFX'
                     keystore = new File(project.projectDir, 'debug.keystore')
                     storepass = 'JavaFX'
         def task = project.task("generateDebugKey", description: "Generates the JAvaFX Debug Key", type: GenKeyTask)
 
         task.conventionMapping.alias     = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.alias }
-        task.conventionMapping.dname     = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.dname }
-        task.conventionMapping.validity  = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.validity }
         task.conventionMapping.keypass   = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.keypass }
         task.conventionMapping.keystore  = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.keystore }
         task.conventionMapping.storepass = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).debugKey.storepass }
+        task.conventionMapping.dname     = {convention, aware -> 'CN=JavaFX Gradle Plugin Default Debug Key, O=JavaFX Debug' }
+        task.conventionMapping.validity  = {convention, aware -> ((365.25) * 25 as int) /* 25 years */ }
     }
 
     private configureJavaFXSignJarTask(Project project) {

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/JavaFXPluginConvention.groovy

 
 class SigningKeyInfo {
     String alias
-    String dname
-    int validity
     String keypass
     File keystore
     String storepass
-    String storetype
 
 
     public SigningKeyInfo(Closure configure) {