File tree Expand file tree Collapse file tree 3 files changed +18
-6
lines changed
src/main/java/com/igormaznitsa/jbbp/plugin/gradle Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change 1
1
def getProp (name , defaultValue ) {
2
- if (project. hasProperty(name)) {
3
- return project. getProperty(name)
4
- } else {
2
+ String found = project. findProperty(name)
3
+ if (found == null ) {
5
4
logger. warn(' Can not find provided property "' + name + ' ", default value ' + defaultValue + ' in use' )
6
5
return defaultValue
6
+ } else {
7
+ return project. getProperty(name)
7
8
}
8
9
}
9
10
@@ -25,7 +26,7 @@ dependencies {
25
26
implementation localGroovy()
26
27
27
28
implementation ' commons-io:commons-io:2.11.0'
28
- implementation " com.igormaznitsa:jbbp:" + jbbpVersion
29
+ implementation ( ' com.igormaznitsa:jbbp:' + jbbpVersion) { transitive = true }
29
30
30
31
implementation " com.igormaznitsa:meta-annotations:" + metaLibVersion
31
32
implementation " com.igormaznitsa:meta-utils:" + metaLibVersion
@@ -58,6 +59,7 @@ task sourcesJar(type: Jar) {
58
59
sourceSets {
59
60
main {
60
61
java {
62
+ srcDirs ' ../../jbbp/src/main/java'
61
63
srcDirs ' src/main/java'
62
64
srcDirs ' ../jbbp-plugin-common/src/main/java'
63
65
}
@@ -79,4 +81,12 @@ gradlePlugin {
79
81
implementationClass = ' com.igormaznitsa.jbbp.plugin.gradle.JBBPPlugin'
80
82
}
81
83
}
84
+ }
85
+
86
+ publishing {
87
+ publications {
88
+ maven(MavenPublication ) {
89
+ from components. java
90
+ }
91
+ }
82
92
}
Original file line number Diff line number Diff line change 104
104
<configuration >
105
105
<executable >${gradle.executable} </executable >
106
106
<arguments >
107
+ <argument >clean</argument >
108
+ <argument >build</argument >
107
109
<argument >${gradleGoal} </argument >
108
110
<argument >--info</argument >
109
111
<argument >--scan</argument >
110
112
<argument >--no-daemon</argument >
111
- <argument >-Djbbp_plugin_version=${project.version} </argument >
113
+ <argument >-Pjbbp_plugin_version=${project.version} </argument >
114
+ <argument >-Pmeta_lib_version=${meta.version} </argument >
112
115
</arguments >
113
116
</configuration >
114
117
<goals >
Original file line number Diff line number Diff line change @@ -41,7 +41,6 @@ public class JBBPGenerateTask extends AbstractJBBPTask {
41
41
* Flag to register the output folder in Java source folders at the end of process.
42
42
*/
43
43
@ Input
44
- @ Optional
45
44
protected boolean addSource = true ;
46
45
47
46
public boolean isAddSource () {
You can’t perform that action at this time.
0 commit comments