Merge pull request #42 from lensesio/feat/scala-2.13-2

Scala 2.13 / SBT Upgrade (Updated)

.github/workflows/build.yml

@@ -4,20 +4,14 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Scala
+        uses: olafurpg/setup-scala@v11
         with:
-          java-version: 1.8
-      - name: Download gradle
-        run: ./gradlew --version
-      - name: Run tests
-        run: ./gradlew test
-      - name: Run compile
-        run: ./gradlew compile
-      - name: Run build
-        run: ./gradlew build
+          java-version: [email protected]
+      - name: Test
+        run: sbt +test

.github/workflows/publish.yml

@@ -11,32 +11,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Scala
+        uses: olafurpg/setup-scala@v11
         with:
-          java-version: 1.8
-      - shell: bash
-        env:
-          GRADLE_PROPERTIES: ${{ secrets.GRADLE_PROPERTIES }}
-          SIGNING_GPG_KEY: ${{ secrets.SIGNING_GPG_KEY }}
-        run: |
-          base64 -d <<< "$SIGNING_GPG_KEY" > /tmp/secring.gpg
-          echo "$GRADLE_PROPERTIES" > gradle.properties
+          java-version: [email protected]
       - name: Get the tag
         id: get_tag
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Build shadowJar for Github
-        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} shadowJar
+      - name: Assembly
+        run: sbt +assembly
+        env:
+          LENSES_TAG_NAME: ${{ steps.get_tag.outputs.VERSION }}
       - name: Release to Github
         uses: softprops/action-gh-release@v1
         with:
-          files: build/libs/secret-provider-${{ steps.get_tag.outputs.VERSION }}-all.jar
+          files: |
+            target/scala-2.12/secret-provider_2.12-${{ steps.get_tag.outputs.VERSION }}-all.jar
+            target/scala-2.13/secret-provider_2.13-${{ steps.get_tag.outputs.VERSION }}-all.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and upload jar to nexus
-        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} signArchives uploadArchives
-      - name: Wait for nexus to settle
-        run: sleep 30
-      - name: Release to nexus
-        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} closeAndReleaseRepository
+          LENSES_TAG_NAME: ${{ steps.get_tag.outputs.VERSION }}

.gitignore

@@ -11,3 +11,6 @@
 /build/
 /.classpath
 /.project
+target/
+/.bsp/
+.DS_Store

.sbtopts

@@ -0,0 +1,4 @@
+-J-Xmx4G
+-J-Xms1024M
+-J-Xss2M
+-J-XX:MaxMetaspaceSize=2G

README.md

@@ -6,32 +6,10 @@
 
 Secret provider for Kafka to provide indirect look up of configuration values.
 
-
-## Installing
-
-Maven
-```xml
-<dependency>
-	<groupId>io.lenses</groupId>
-	<artifactId>secret-provider</artifactId>
-	<version>2.1.3</version>
-</dependency>
-```
-
-SBT
-```bash
-libraryDependencies += "io.lenses" % "secret-provider" % "2.1.3"
-```
-
-Gradle
-```bash
-compile 'io.lenses:secret-provider:2.1.3'
-```
-
 ## Description
 
 External secret providers allow for indirect references to be placed in an
-applications configuration, so for example, that secrets are not exposed in the
+applications' configuration, so for example, that secrets are not exposed in the
 Worker API endpoints of Kafka Connect.
 
 For [Documentation](https://docs.lenses.io/4.0/integrations/connectors/secret-providers/).
@@ -46,28 +24,16 @@ and submit a pull request. Thanks!
 
 ### Building
 
-***Requires gradle 6.0 to build.***
-
-To build
-
-```bash
-gradle compile
-```
+***Requires SBT to build.***
 
-To test
+To build the (scala 2.12 and 2.13) assemblies for use with Kafka Connect (also runs tests):
 
 ```bash
-gradle test
+sbt +assembly
 ```
 
-To create a fat jar
+To run tests:
 
 ```bash
-gradle shadowJar
-```
-
-You can also use the gradle wrapper
-
-```
-./gradlew shadowJar
+sbt +test
 ```