Skip to content

Commit

Permalink
Prepare for upcoming release
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennestuder committed Dec 26, 2023
1 parent c3028be commit a52f866
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 20 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ The following Gradle features are supported by the jOOQ plugin:

| Plugin version | Compatible Gradle versions | Support for Gradle Kotlin DSL |Support for Gradle Configuration Cache| Minimum JDK | Minimum jOOQ |
|----------------|----------------------------|-------------------------------|--------------------------------------|-------------|--------------|
| 9.0+ | 8.0+ | Yes | Yes | 17 | 3.16+ |
| 8.0+ | 7.0+ | Yes | Yes | 17 | 3.16+ |
| 7.0+ | 6.1+, 7.0+ | Yes | Yes | 11 | 3.16+ |
| 6.0+ | 6.1+, 7.0+ | Yes | Yes | 11 | <= 3.15 |
Expand All @@ -73,15 +74,15 @@ Apply the `nu.studer.jooq` plugin to your Gradle project.

```groovy
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
}
```

### Gradle Kotlin DSL

```kotlin
plugins {
id("nu.studer.jooq") version "8.2.3"
id("nu.studer.jooq") version "9.0"
}
```

Expand Down Expand Up @@ -502,6 +503,7 @@ When migrating your build from jOOQ plugin 4.x to 5.x, follow these steps:
# Changelog

+ Next - TBD
+ 9.0 - Do not register any dependency resolution rules. Make Gradle 8.0 the minimum compatible version.
+ 8.2.3 - Apply version and edition lazily.
+ 8.2.2 - Avoid deprecation warnings when using the plugin with Gradle 9. Upgrade to jOOQ 3.19.1.
+ 8.2.1 - Avoid race condition when running multiple jOOQ tasks in parallel. Upgrade to jOOQ 3.18.4.
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group = 'nu.studer'
version = '8.2.3'
version = '9.0'

configurations.all { Configuration c ->
c.resolutionStrategy.eachDependency { DependencyResolveDetails details ->
Expand Down
2 changes: 1 addition & 1 deletion example/configure_custom_generator_strategy/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_generation_tool_execution/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.util.concurrent.atomic.AtomicReference

plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_jooq_config_normalization/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import nu.studer.gradle.jooq.JooqEdition
plugins {
id 'org.springframework.boot' version '2.7.18'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_jooq_with_flyway/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.flywaydb.flyway' version '9.7.0'
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_jvm_args/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_task_dependencies/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_toolchain_gradle_dsl/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/configure_toolchain_kotlin_dsl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("nu.studer.jooq") version "8.2.3"
id("nu.studer.jooq") version "9.0"
id("java")
}

Expand Down
2 changes: 1 addition & 1 deletion example/extract_script_file/jooq.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'nu.studer:gradle-jooq-plugin:8.2.3'
classpath 'nu.studer:gradle-jooq-plugin:9.0'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/use_groovy_dsl/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import nu.studer.gradle.jooq.JooqEdition

plugins {
id 'nu.studer.jooq' version '8.2.3'
id 'nu.studer.jooq' version '9.0'
id 'java'
}

Expand Down
2 changes: 1 addition & 1 deletion example/use_kotlin_dsl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jooq.meta.jaxb.Property
import org.jooq.meta.jaxb.ForcedType

plugins {
id("nu.studer.jooq") version "8.2.3"
id("nu.studer.jooq") version "9.0"
id("java")
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/nu/studer/gradle/jooq/JooqPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public class JooqPlugin implements Plugin<Project> {

public void apply(Project project) {
// abort if old Gradle version is not supported
if (GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("6.1")) < 0) {
throw new IllegalStateException("This version of the jooq plugin is not compatible with Gradle < 6.1");
if (GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("7.0")) < 0) {
throw new IllegalStateException("This version of the jooq plugin is not compatible with Gradle < 7.0");
}

// apply Java base plugin, making it possible to also use the jOOQ plugin for Android builds
Expand Down

0 comments on commit a52f866

Please sign in to comment.