Skip to content

Commit 2b6f83e

Browse files
[Issue-556] Drop support for Scala 2.11 (#568)
Signed-off-by: thekingofcity <[email protected]>
1 parent ef776a3 commit 2b6f83e

File tree

3 files changed

+7
-75
lines changed

3 files changed

+7
-75
lines changed

.github/workflows/build.yml

+4-72
Original file line numberDiff line numberDiff line change
@@ -52,46 +52,8 @@ jobs:
5252
- name: Build via Gradle
5353
run: ./gradlew clean build
5454

55-
build_with_scala_211:
56-
name: Build with Scala 2.11
57-
runs-on: ubuntu-latest
58-
steps:
59-
- uses: actions/checkout@v2
60-
with:
61-
# see comments above
62-
fetch-depth: 0
63-
64-
- name: Set up JDK 11
65-
uses: actions/setup-java@v1
66-
with:
67-
java-version: '11' # major or semver Java version will be acceptable, see https://github.com/marketplace/actions/setup-java-jdk#basic
68-
java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
69-
architecture: x64 # (x64 or x86) - defaults to x64
70-
71-
# see comments above
72-
- name: Cache gradle modules
73-
uses: actions/cache@v2
74-
with:
75-
path: |
76-
.gradle
77-
$HOME/.gradle
78-
$HOME/.m2
79-
key: ${{ runner.os }}-gradle-scala211-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
80-
81-
# see comments above
82-
- name: Cache build outputs
83-
uses: actions/cache@v2
84-
with:
85-
path: ./*
86-
key: scala211-${{ github.run_id }}
87-
88-
- name: Grant execute permission for gradlew
89-
run: chmod +x gradlew
90-
91-
- name: Build via Gradle with Scala 2.11
92-
run: |
93-
./gradlew clean build -PflinkScalaVersion=2.11
94-
bash <(curl -s https://codecov.io/bash) -t 9c42ff48-d98f-4444-af05-cf734aa1dbd0
55+
- name: Report to Codecov
56+
run: bash <(curl -s https://codecov.io/bash) -t 9c42ff48-d98f-4444-af05-cf734aa1dbd0
9557

9658
snapshot:
9759
name: Publish snapshot to Github Packages
@@ -103,7 +65,7 @@ jobs:
10365
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
10466
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
10567
steps:
106-
# see comments above
68+
# gradle packages that need to be cached
10769
- name: Cache gradle modules
10870
uses: actions/cache@v2
10971
with:
@@ -113,7 +75,7 @@ jobs:
11375
$HOME/.m2
11476
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
11577

116-
# see comments above
78+
# publish the artifact from the build cache
11779
- name: Cache build outputs
11880
uses: actions/cache@v2
11981
with:
@@ -122,33 +84,3 @@ jobs:
12284

12385
- name: Publish to Github Packages
12486
run: ./gradlew publish -PpublishUrl=https://maven.pkg.github.com/${{github.repository}} -PpublishUsername=${{github.actor}} -PpublishPassword=${{secrets.GITHUB_TOKEN}}
125-
126-
snapshot_with_scala_211:
127-
name: Publish snapshot to Github Packages with Scala 2.11
128-
needs: [build_with_scala_211]
129-
runs-on: ubuntu-latest
130-
# only publish the snapshot when it is a push on the master or the release branch (starts with r0.x or r1.x)
131-
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/r0.') || startsWith(github.ref, 'refs/heads/r1.')) }}
132-
env:
133-
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
134-
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
135-
steps:
136-
# see comments above
137-
- name: Cache gradle modules
138-
uses: actions/cache@v2
139-
with:
140-
path: |
141-
.gradle
142-
$HOME/.gradle
143-
$HOME/.m2
144-
key: ${{ runner.os }}-gradle-scala211-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
145-
146-
# see comments above
147-
- name: Cache build outputs
148-
uses: actions/cache@v2
149-
with:
150-
path: ./*
151-
key: scala211-${{ github.run_id }}
152-
153-
- name: Publish to Github Packages with Scala 2.11
154-
run: ./gradlew publish -PpublishUrl=https://maven.pkg.github.com/${{github.repository}} -PpublishUsername=${{github.actor}} -PpublishPassword=${{secrets.GITHUB_TOKEN}} -PflinkScalaVersion=2.11

documentation/src/docs/dev-guide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ However, you can go straight to the completed example at [flink-connector-exampl
3131
# Starting Flink
3232
Download Flink release and un-tar it. We use Flink 1.11.2 here.
3333
```
34-
$ tar -xzf flink-1.11.2-bin-scala_2.11.tgz
35-
$ cd flink-1.11.2-bin-scala_2.11
34+
$ tar -xzf flink-1.11.2-bin-scala_2.12.tgz
35+
$ cd flink-1.11.2-bin-scala_2.12
3636
```
3737
Start a cluster
3838
```

documentation/src/docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You may obtain a copy of the License at
99
-->
1010
# Pravega Flink Connectors [![Build Status](https://travis-ci.org/pravega/flink-connectors.svg?branch=master)](https://travis-ci.org/pravega/flink-connectors)
1111

12-
This repository implements connectors to read and write [Pravega](http://pravega.io/) Streams with [Apache Flink](http://flink.apache.org/) stream processing framework.
12+
This repository implements connectors to read and write [Pravega](http://pravega.io/) Streams with [Apache Flink](http://flink.apache.org/) stream processing framework.
1313

1414
The connectors can be used to build end-to-end stream processing pipelines (see [Samples](https://github.com/pravega/pravega-samples)) that use Pravega as the stream storage and message bus, and Apache Flink for computation over the streams.
1515

0 commit comments

Comments
 (0)