Skip to content

Commit

Permalink
Merge pull request #65 from this-Aditya/bump-versions
Browse files Browse the repository at this point in the history
Gradle, Dependencies and workflows Updated
  • Loading branch information
yatharthranjan authored Mar 14, 2024
2 parents c8f4db6 + 678d9c2 commit 1589292
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 41 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
java-version: 17

- name: Cache
uses: actions/cache@v2.0.0
uses: actions/cache@v3
with:
# Cache gradle directories
path: |
Expand Down Expand Up @@ -55,31 +56,31 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# Add Docker labels and tags
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: ${{ env.DOCKER_IMAGE }}

# Setup docker build environment
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
id: cache-buildx
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile', '**/*.gradle.kts', 'gradle.properties', 'src/main/**') }}
Expand All @@ -94,7 +95,7 @@ jobs:
echo "::set-output name=cache-to::type=local,dest=/tmp/.buildx-cache-new,mode=max"
fi
- name: Build docker
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: ${{ steps.cache-parameters.outputs.cache-to }}
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
java-version: 17

- name: Cache
uses: actions/cache@v2.0.0
uses: actions/cache@v3
with:
# A list of files, directories, and wildcard patterns to cache and restore
path: |
Expand Down Expand Up @@ -52,32 +53,32 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Setup docker build environment
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# Add Docker labels and tags
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: ${{ env.DOCKER_IMAGE }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Build docker
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
# Allow running the image on the architectures supported by openjdk:17-jre-slim
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gradle:7.0.2-jdk11 as builder
FROM --platform=$BUILDPLATFORM gradle:8.3-jdk17 as builder

RUN mkdir /code
WORKDIR /code
Expand All @@ -29,7 +29,7 @@ RUN gradle distTar --no-watch-fs \
&& tar xzf *.tar.gz \
&& rm *.tar.gz radar-push-endpoint-*/lib/radar-push-endpoint-*.jar

FROM openjdk:11-jre-slim
FROM eclipse-temurin:17-jre

MAINTAINER @yatharthranjan

Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ dependencies {

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
apiVersion = "1.5"
languageVersion = "1.5"
jvmTarget = "17"
apiVersion = "1.8"
languageVersion = "1.8"
}
}

Expand Down Expand Up @@ -189,5 +189,5 @@ tasks.withType<DependencyUpdatesTask> {
}

tasks.wrapper {
gradleVersion = "7.1"
gradleVersion = "8.3"
}
2 changes: 1 addition & 1 deletion deprecated-javax/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
implementation("io.confluent:kafka-schema-registry-client:$confluentVersion") {
isTransitive = false
}
implementation("org.glassfish.jersey.core:jersey-common:2.31")
implementation("org.glassfish.jersey.core:jersey-common:3.1.5")
implementation("io.swagger:swagger-annotations:1.6.2")
implementation("io.confluent:common-utils:$confluentVersion") {
isTransitive = false
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
org.gradle.jvmargs=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
dockerComposeStopContainers=true

kotlinVersion=1.6.10
okhttp3Version=4.9.3
radarJerseyVersion=0.9.1
radarCommonsVersion=0.13.2
radarSchemasVersion=0.8.3
kotlinVersion=1.9.22
okhttp3Version=4.12.0
radarJerseyVersion=0.10.0
radarCommonsVersion=0.15.0
radarSchemasVersion=0.8.6
radarOauthClientVersion=0.8.0
jacksonVersion=2.14.1
slf4jVersion=2.0.7
log4j2Version=2.20.0
kafkaVersion=2.8.1
confluentVersion=6.2.0
junitVersion=5.7.2
jedisVersion=3.6.1
grizzlyVersion=3.0.1
slf4jVersion=2.0.12
log4j2Version=2.23.0
kafkaVersion=3.6.1
confluentVersion=7.6.0
junitVersion=5.10.2
jedisVersion=5.1.2
grizzlyVersion=4.0.2
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 1589292

Please sign in to comment.