You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/05/17 07:20:39 UTC
[cayenne] 01/05: feat: change gradle version to 7.0 (change archive
file version, replace compile configuration with implementation,
add necessary getters, remove @optional above primitive values,
add version 7.0 to tests of compatibility)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 8f9844d18f66e0db76d2d360911b1a9228d3f58e
Author: dmitrij <dm...@gmail.com>
AuthorDate: Wed May 12 11:44:36 2021 +0300
feat: change gradle version to 7.0 (change archive file version, replace compile configuration with implementation, add necessary getters, remove @optional above primitive values, add version 7.0 to tests of compatibility)
---
cayenne-gradle-plugin/build.gradle | 6 +++---
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../java/org/apache/cayenne/tools/BaseCayenneTask.java | 4 ++++
.../src/main/java/org/apache/cayenne/tools/CgenTask.java | 16 ++++++++++++++++
.../java/org/apache/cayenne/tools/DbGenerateTask.java | 5 -----
.../main/java/org/apache/cayenne/tools/DbImportTask.java | 4 ++++
.../java/org/apache/cayenne/tools/GradlePluginIT.java | 4 +++-
.../tools/dbimport-with-project-dependency.gradle | 6 +++++-
8 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/cayenne-gradle-plugin/build.gradle b/cayenne-gradle-plugin/build.gradle
index 74dd71e..656c39c 100644
--- a/cayenne-gradle-plugin/build.gradle
+++ b/cayenne-gradle-plugin/build.gradle
@@ -48,13 +48,13 @@ def classpathFile = file('build/classpath.txt')
if (classpathFile.file) {
String[] paths = classpathFile.text.split(';')
dependencies {
- add 'compile', files(paths)
+ add 'implementation', files(paths)
}
}
dependencies {
- compile gradleApi()
- compile localGroovy()
+ implementation gradleApi()
+ implementation localGroovy()
}
// Create file with cayenne-gradle-plugin version
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index 166742b..ea9326a 100644
--- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java
index 5fc40fc..74330a2 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java
@@ -56,6 +56,10 @@ public class BaseCayenneTask extends DefaultTask {
setMap(mapFile);
}
+ public String getMapFileName() {
+ return mapFileName;
+ }
+
@Internal
public File getDataMapFile() {
if (map != null) {
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
index d3eee61..849d40b 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
@@ -431,6 +431,22 @@ public class CgenTask extends BaseCayenneTask {
this.excludeEmbeddables = excludeEmbeddables;
}
+ public Boolean getCreatePKProperties() {
+ return createPKProperties;
+ }
+
+ public String getExternalToolConfig() {
+ return externalToolConfig;
+ }
+
+ public String getQueryTemplate() {
+ return queryTemplate;
+ }
+
+ public String getQuerySuperTemplate() {
+ return querySuperTemplate;
+ }
+
/**
* @param excludeEmbeddables pattern to use for embeddable exclusion
* @since 4.1
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
index 893fced..fd1b4cc 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
@@ -58,23 +58,18 @@ public class DbGenerateTask extends BaseCayenneTask {
private DataSourceConfig dataSource = new DataSourceConfig();
@Input
- @Optional
private boolean dropTables;
@Input
- @Optional
private boolean dropPK;
@Input
- @Optional
private boolean createTables = true;
@Input
- @Optional
private boolean createPK = true;
@Input
- @Optional
private boolean createFK = true;
@InputFile
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
index f4bcfa2..62cc1f1 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
@@ -188,6 +188,10 @@ public class DbImportTask extends BaseCayenneTask {
setAdapter(adapter);
}
+ public ReverseEngineering getReverseEngineering() {
+ return reverseEngineering;
+ }
+
@OutputFile
@Optional
public File getCayenneProject() {
diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
index 54afff8..9f72cbb 100644
--- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
+++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
@@ -56,7 +56,9 @@ public class GradlePluginIT extends BaseTaskIT {
// Old gradle versions will fail on new JDK
int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version"));
- if(javaMajorVersion >= 11) {
+ if(javaMajorVersion >= 16) {
+ versions = new String[]{"7.0"};
+ } else if(javaMajorVersion >= 11) {
versions = new String[]{"4.8"};
} else if (javaMajorVersion < 9) {
versions = new String[]{"4.3", "4.0", "3.5", "3.3", "3.0", "2.12", "2.8"};
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/dbimport-with-project-dependency.gradle b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/dbimport-with-project-dependency.gradle
index aa75720..f6c0430 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/dbimport-with-project-dependency.gradle
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/dbimport-with-project-dependency.gradle
@@ -35,7 +35,11 @@ cdbimport {
}
dependencies {
- compile 'mysql:mysql-connector-java:6.0.5'
+ implementation 'mysql:mysql-connector-java:6.0.5'
+}
+
+configurations {
+ project.configurations.getByName("implementation").setCanBeResolved(true)
}
repositories {