From f31c70703a7139aeffc6ba5e24b98c33df9371ca Mon Sep 17 00:00:00 2001 From: cschabl Date: Fri, 31 Mar 2023 12:23:57 +0200 Subject: [PATCH 1/3] #51 - upgrade gradle-plugin to 2.0.3, upgrade gradle to 8.0.2, upgrade activejdbc to 2.6-j8 --- activejdbc-gradle/build.gradle | 4 ++-- activejdbc-gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activejdbc-gradle/build.gradle b/activejdbc-gradle/build.gradle index 239994f..7dacca5 100644 --- a/activejdbc-gradle/build.gradle +++ b/activejdbc-gradle/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" - id "de.schablinski.activejdbc-gradle-plugin" version "2.0" + id "de.schablinski.activejdbc-gradle-plugin" version "2.0.3" } repositories { @@ -12,7 +12,7 @@ repositories { dependencies { runtimeOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.13' - implementation group: 'org.javalite', name: 'activejdbc', version: '2.3.2-j8' + implementation group: 'org.javalite', name: 'activejdbc', version: '2.6-j8' implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.5' testImplementation group: 'junit', name: 'junit', version: '4.8.2' } diff --git a/activejdbc-gradle/gradle/wrapper/gradle-wrapper.properties b/activejdbc-gradle/gradle/wrapper/gradle-wrapper.properties index 0071047..eefdb79 100644 --- a/activejdbc-gradle/gradle/wrapper/gradle-wrapper.properties +++ b/activejdbc-gradle/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip From 74b840c638826f34c01b0bb12c46d0324bc0fd42 Mon Sep 17 00:00:00 2001 From: cschabl Date: Fri, 28 Apr 2023 21:38:15 +0200 Subject: [PATCH 2/3] #53 - upgrade activejdbc dependency to 3.4-j11 --- activejdbc-gradle/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activejdbc-gradle/build.gradle b/activejdbc-gradle/build.gradle index 7dacca5..a42750b 100644 --- a/activejdbc-gradle/build.gradle +++ b/activejdbc-gradle/build.gradle @@ -12,7 +12,7 @@ repositories { dependencies { runtimeOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.13' - implementation group: 'org.javalite', name: 'activejdbc', version: '2.6-j8' + implementation group: 'org.javalite', name: 'activejdbc', version: '3.4-j11' implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.5' testImplementation group: 'junit', name: 'junit', version: '4.8.2' } From 81c8d9e28bf09fba638fcb65ba4347a315ff3e92 Mon Sep 17 00:00:00 2001 From: cschabl Date: Fri, 28 Apr 2023 21:56:14 +0200 Subject: [PATCH 3/3] #51 - build: setting Java 11 as target --- activejdbc-gradle/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/activejdbc-gradle/build.gradle b/activejdbc-gradle/build.gradle index a42750b..097d00e 100644 --- a/activejdbc-gradle/build.gradle +++ b/activejdbc-gradle/build.gradle @@ -9,6 +9,9 @@ repositories { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } +compileJava { + options.release = 11 +} dependencies { runtimeOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.13'