You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ar...@apache.org on 2021/11/17 14:35:59 UTC

[flink-connectors] 03/03: [poc] Fix repository and add compatibility

This is an automated email from the ASF dual-hosted git repository.

arvid pushed a commit to branch poc
in repository https://gitbox.apache.org/repos/asf/flink-connectors.git

commit bde61f15cb2e3f74b1e4e5e86b30efb5fe0aa4df
Author: Arvid Heise <ar...@ververica.com>
AuthorDate: Wed Nov 17 15:31:22 2021 +0100

    [poc] Fix repository and add compatibility
---
 build.gradle.kts                          | 32 ++++++++++++++++---------------
 buildSrc/build.gradle.kts                 |  5 +++++
 buildSrc/src/main/kotlin/Compatibility.kt |  1 +
 kafka/build.gradle.kts                    |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 044fd5b..c390270 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,23 @@ plugins {
     checkstyle
 }
 
+group = "org.apache.flink.connectors"
+version = "1.0.0-SNAPSHOT"
+
+allprojects {
+    apply(plugin = "java-library")
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(8))
+        }
+    }
+
+    repositories {
+        mavenCentral()
+    }
+}
+
 val isCiServer = System.getenv().containsKey("CI")
 //if (!gradle.startParameter.isOffline && isCiServer) {
     configure<com.gradle.scan.plugin.BuildScanExtension> {
@@ -13,13 +30,6 @@ val isCiServer = System.getenv().containsKey("CI")
     }
 //}
 
-group = "org.apache.flink.connectors"
-version = "1.0.0-SNAPSHOT"
-
-repositories {
-    mavenCentral()
-}
-
 configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     java {
         googleJavaFormat("1.7").aosp()
@@ -30,14 +40,6 @@ configure<CheckstyleExtension> {
 }
 
 subprojects {
-    apply(plugin = "java-library")
-
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(8))
-        }
-    }
-
     dependencies {
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b0b5e2b..7955046 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,10 @@
 plugins {
     `java-library`
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
 }
 
 version = "1.0.0-SNAPSHOT"
diff --git a/buildSrc/src/main/kotlin/Compatibility.kt b/buildSrc/src/main/kotlin/Compatibility.kt
index a9f349a..5359957 100644
--- a/buildSrc/src/main/kotlin/Compatibility.kt
+++ b/buildSrc/src/main/kotlin/Compatibility.kt
@@ -9,6 +9,7 @@ enum class FlinkVersion {
  */
 fun Project.minimumFlinkVersion(version: FlinkVersion): Unit {
     // TODO:
+    this.setProperty("min_version", version.name)
 }
 
 fun Project.maximumFlinkVersion(version: FlinkVersion): Unit {
diff --git a/kafka/build.gradle.kts b/kafka/build.gradle.kts
index 03732e0..99cc5b1 100644
--- a/kafka/build.gradle.kts
+++ b/kafka/build.gradle.kts
@@ -1,6 +1,6 @@
 version = "1.2.2-SNAPSHOT"
 
-//compatibleTo(FlinkVersion.FLINK_1_12, FlinkVersion.FLINK_1_13)
+minimumFlinkVersion(FlinkVersion.FLINK_1_12)
 
 repositories {
     // maven(url = "http://confluent")