Skip to content

Commit 49ff68e

Browse files
committed
adapted for Gradle 7 build
1 parent 0a155cd commit 49ff68e

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

jbbp-plugins/jbbp-gradle/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,25 @@ def getProp(name, dflt) {
88
}
99

1010
def jbbpVersion = getProp('jbbp_plugin_version', '2.0.4-SNAPSHOT')
11-
def metaLibVersion = getProp('meta_lib_version', '1.1.2')
1211

1312
group = 'com.igormaznitsa'
1413
version = jbbpVersion
1514

1615
apply plugin: 'groovy'
17-
apply plugin: 'maven'
16+
apply plugin: 'maven-publish'
1817
apply plugin: "com.gradle.plugin-publish"
1918

2019
sourceCompatibility = 1.8
2120
targetCompatibility = 1.8
2221

2322
dependencies {
24-
compile gradleApi()
25-
compile localGroovy()
23+
implementation gradleApi()
24+
implementation localGroovy()
2625

27-
compile "commons-io:commons-io:2.8.0"
28-
compile "com.igormaznitsa:jbbp:" + jbbpVersion
29-
compile "com.igormaznitsa:meta-annotations:" + metaLibVersion
30-
compile "com.igormaznitsa:meta-utils:" + metaLibVersion
26+
implementation "commons-io:commons-io:2.8.0"
27+
implementation "com.igormaznitsa:jbbp:" + jbbpVersion
3128

32-
testCompile 'junit:junit:4.13.1'
29+
testImplementation 'junit:junit:4.13.1'
3330
}
3431

3532
repositories {
@@ -44,7 +41,7 @@ buildscript {
4441
}
4542
}
4643
dependencies {
47-
classpath "com.gradle.publish:plugin-publish-plugin:0.9.7"
44+
classpath "com.gradle.publish:plugin-publish-plugin:0.16.0"
4845
}
4946
}
5047

jbbp-plugins/jbbp-gradle/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<maven.compiler.source>1.8</maven.compiler.source>
2626
<maven.compiler.target>1.8</maven.compiler.target>
2727
<gradle.executable>gradle</gradle.executable>
28-
<gradleGoal>install</gradleGoal>
28+
<gradleGoal>publishToMavenLocal</gradleGoal>
2929
</properties>
3030

3131
<profiles>
@@ -104,9 +104,10 @@
104104
<executable>${gradle.executable}</executable>
105105
<arguments>
106106
<argument>${gradleGoal}</argument>
107-
<argument>-i</argument>
108-
<argument>-S</argument>
107+
<argument>--info</argument>
108+
<argument>--scan</argument>
109109
<argument>--no-daemon</argument>
110+
<argument>-Djbbp_plugin_version=${project.version}</argument>
110111
</arguments>
111112
</configuration>
112113
<goals>

0 commit comments

Comments
 (0)