Merge pull request #66 from atlanhq/DX-314

Migrates toolkit portion to atlan-java
atlanhq · Nov 8, 2023 · 16a4506 · 16a4506
2 parents 85980f0 + 6f519f5
commit 16a4506
Show file tree

Hide file tree

Showing 79 changed files with 69 additions and 2,876 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,8 @@ bin/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+### Generated packages ###
+packages/**/resources/**
+pipelines/**/resources/**
diff --git a/...ain/kotlin/atlan-kotlin-sample.gradle.kts → ...om.atlan.kotlin-custom-package.gradle.kts b/...ain/kotlin/atlan-kotlin-sample.gradle.kts → ...om.atlan.kotlin-custom-package.gradle.kts
@@ -5,21 +5,33 @@ plugins {
     id("com.diffplug.spotless")
 }
 
-group = "com.atlan"
+group = providers.gradleProperty("group").get()
+version = providers.gradleProperty("version").get()
 
 repositories {
     mavenCentral()
+    maven {
+        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
 }
 
 dependencies {
-    implementation("com.atlan:atlan-java:1.6.0")
+    implementation("com.atlan:atlan-java:1.7.0-SNAPSHOT")
+    implementation("com.atlan:package-toolkit-runtime:1.7.0-SNAPSHOT")
+    implementation("com.atlan:package-toolkit-config:1.7.0-SNAPSHOT")
     implementation("io.github.microutils:kotlin-logging-jvm:3.0.5")
     runtimeOnly("org.apache.logging.log4j:log4j-core:2.20.0")
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0")
     testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.10")
 }
 
 tasks {
+    jar {
+        destinationDirectory.set(file(jarPath))
+    }
     test {
         useJUnitPlatform()
     }

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
diff --git a/common/src/main/kotlin/Utils.kt b/common/src/main/kotlin/Utils.kt
diff --git a/common/src/main/kotlin/config/RuntimeConfig.kt b/common/src/main/kotlin/config/RuntimeConfig.kt
diff --git a/common/src/main/resources/log4j2.xml b/common/src/main/resources/log4j2.xml
diff --git a/containers/Dockerfile b/containers/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2023 Atlan Pte. Ltd.
-FROM ghcr.io/atlanhq/atlan-java:1.6.0
+FROM ghcr.io/atlanhq/atlan-java@sha256:f6ab4d0d615b03c2e17f356ba24a26c6c9cbe7fb242801594a1c4588c1fd438d
 
 LABEL org.opencontainers.image.vendor="Atlan Pte. Ltd." \
       org.opencontainers.image.source="https://github.com/atlanhq/atlan-kotlin-samples" \

diff --git a/events/build.gradle.kts b/events/build.gradle.kts