Skip to content

Commit 6d48fbb

Browse files
authored
Merge pull request #745 from commercetools/fix-export-signatures-plugin
fix exportSignatures plugin
2 parents 35df01a + 937b23d commit 6d48fbb

File tree

25 files changed

+209
-126
lines changed

25 files changed

+209
-126
lines changed

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ plugins {
1919

2020
id "me.champeau.jmh" version "0.6.8"
2121
id "jacoco"
22+
23+
id "versioning"
24+
id "srcinfo"
2225
}
2326

2427
import java.text.SimpleDateFormat
@@ -87,6 +90,10 @@ subprojects { project ->
8790
apply from: "$rootDir/gradle-scripts/subproject-dependencies.gradle"
8891
apply from: "$rootDir/gradle-scripts/subproject-config.gradle"
8992

93+
if (project.file("build.gradle").exists()) {
94+
apply from: "$rootDir/gradle-scripts/subproject-srcinfo-plugin.gradle"
95+
}
96+
9097
group='com.commercetools.sdk'
9198

9299
version = globalVersion

buildSrc/build.gradle

Lines changed: 0 additions & 19 deletions
This file was deleted.

buildSrc/src/main/resources/META-INF/gradle-plugins/srcinfo.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

buildSrc/src/main/resources/META-INF/gradle-plugins/versioning.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/MigrationModelClassMapping.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@
265265
* <td>{@link com.commercetools.api.models.cart.CartChangeTaxRoundingModeAction}</td>
266266
* </tr>
267267
* <tr>
268+
* <td>{@link io.sphere.sdk.carts.commands.updateactions.FreezeCart}</td>
269+
* <td>{@link com.commercetools.api.models.cart.CartFreezeCartAction}</td>
270+
* </tr>
271+
* <tr>
268272
* <td>{@link io.sphere.sdk.carts.commands.updateactions.Recalculate}</td>
269273
* <td>{@link com.commercetools.api.models.cart.CartRecalculateAction}</td>
270274
* </tr>
@@ -441,6 +445,10 @@
441445
* <td>{@link com.commercetools.api.models.cart.CartSetShippingRateInputAction}</td>
442446
* </tr>
443447
* <tr>
448+
* <td>{@link io.sphere.sdk.carts.commands.updateactions.UnfreezeCart}</td>
449+
* <td>{@link com.commercetools.api.models.cart.CartUnfreezeCartAction}</td>
450+
* </tr>
451+
* <tr>
444452
* <td>{@link io.sphere.sdk.carts.commands.updateactions.UpdateItemShippingAddress}</td>
445453
* <td>{@link com.commercetools.api.models.cart.CartUpdateItemShippingAddressAction}</td>
446454
* </tr>

common-plugins/build.gradle

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id 'java-gradle-plugin'
3+
id 'idea'
4+
id 'org.jetbrains.kotlin.jvm' version "2.0.0"
5+
}
6+
7+
repositories {
8+
mavenCentral()
9+
}
10+
11+
java {
12+
toolchain {
13+
languageVersion = JavaLanguageVersion.of(11)
14+
}
15+
}
16+
17+
group = 'com.commercetools.sdk.plugins'
18+
version = '1.0'
19+
20+
gradlePlugin {
21+
plugins.register('srcinfo-plugin') {
22+
id = 'srcinfo'
23+
implementationClass = 'com.commercetools.sdk.plugins.SrcInfoPlugin'
24+
}
25+
plugins.register("versioning-plugin") {
26+
id = 'versioning'
27+
implementationClass = 'com.commercetools.sdk.plugins.VersioningPlugin'
28+
}
29+
}
30+
31+
dependencies {
32+
implementation project(path: ':javaparser', configuration: 'shadow')
33+
implementation "com.google.code.gson:gson:2.11.0"
34+
implementation 'com.squareup:javapoet:1.13.0'
35+
implementation 'com.google.guava:guava:33.3.1-jre'
36+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
plugins {
2+
id 'java'
3+
id 'com.github.johnrengelman.shadow' version '7.1.2'
4+
}
5+
6+
group = 'com.commercetools.sdk.plugins'
7+
version = '1.0'
8+
9+
repositories {
10+
mavenCentral()
11+
}
12+
13+
shadowJar {
14+
relocate 'com.github.javaparser', 'shadow.javaparser'
15+
}
16+
17+
dependencies {
18+
implementation 'com.github.javaparser:javaparser-core:3.26.2'
19+
}

common-plugins/settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include("javaparser")

buildSrc/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt renamed to common-plugins/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.commercetools.sdk.plugins
22

3-
import com.github.javaparser.StaticJavaParser
4-
import com.github.javaparser.ast.CompilationUnit
5-
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration
6-
import com.github.javaparser.ast.body.ConstructorDeclaration
7-
import com.github.javaparser.ast.body.MethodDeclaration
8-
import com.github.javaparser.ast.body.TypeDeclaration
3+
import shadow.javaparser.StaticJavaParser
4+
import shadow.javaparser.ast.CompilationUnit
5+
import shadow.javaparser.ast.body.ClassOrInterfaceDeclaration
6+
import shadow.javaparser.ast.body.ConstructorDeclaration
7+
import shadow.javaparser.ast.body.MethodDeclaration
8+
import shadow.javaparser.ast.body.TypeDeclaration
99
import com.squareup.javapoet.*
1010
import org.gradle.api.DefaultTask
1111
import org.gradle.api.plugins.JavaPluginExtension

0 commit comments

Comments
 (0)