Skip to content

Commit

Permalink
feat: Update actions and libs.
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwinBetanc0urt committed Sep 5, 2024
1 parent 78e9554 commit a6d77b2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ jobs:
architecture: x64

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
env:
GITHUB_DEPLOY_USER: "${{ github.actor }}"
GITHUB_DEPLOY_TOKEN: "${{ secrets.DEPLOY_TOKEN }}"
GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }}
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 8.0.2
arguments: build
env:
GITHUB_DEPLOY_USER: ${{ github.actor }}
GITHUB_DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }}

- name: Upload descriptor file artifact
uses: actions/upload-artifact@v4
Expand Down
21 changes: 12 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ group 'com.nikhilm'
sourceCompatibility = 1.11

def grpcVersion = '1.62.2'
def protobufVersion = '3.25.3'
def baseVersion = '3.9.4'
def baseGroupId = 'io.github.adempiere'
def privateDependencyBaseVersion = "adempiere-3.9.4"
Expand All @@ -38,21 +39,23 @@ repositories {
mavenLocal()
mavenCentral()
maven {
url = System.getenv("GITHUB_DEPLOY_REPOSITORY") ?: System.properties['deploy.repository'] ?: 'https://maven.pkg.github.com'
credentials {
username = System.getenv("GITHUB_DEPLOY_USER") ?: System.properties['deploy.user']
password = System.getenv("GITHUB_DEPLOY_TOKEN") ?: System.properties['deploy.token']
// Adempiere GitHub Organization
url = findProperty("deployRepository") ?: System.properties['deploy.repository'] ?: System.getenv("GITHUB_DEPLOY_REPOSITORY") ?: 'https://maven.pkg.github.com'
credentials {
// project property, system properrty, enviroment variable
username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: System.getenv("GITHUB_DEPLOY_USER")
password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: System.getenv("GITHUB_DEPLOY_TOKEN")
}
}
}

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.25.3"
artifact = "com.google.protobuf:protoc:${protobufVersion}"
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1'
artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
}
}
generateProtoTasks {
Expand Down Expand Up @@ -146,8 +149,8 @@ dependencies {
implementation "io.grpc:grpc-stub:${grpcVersion}"
implementation "io.grpc:grpc-netty:${grpcVersion}"
// https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
implementation 'com.google.protobuf:protobuf-java:3.25.3'
implementation 'com.google.protobuf:protobuf-java-util:3.25.3'
implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"

//implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
//implementation 'com.sun.xml.bind:jaxb-impl:3.0.0-M4'
Expand All @@ -157,7 +160,7 @@ dependencies {

// ADempiere Core
implementation "${baseGroupId}:base:${baseVersion}"
implementation "${baseGroupId}:adempiere-grpc-utils:1.3.4"
implementation "${baseGroupId}:adempiere-grpc-utils:1.3.8"

// Others
compileOnly 'org.apache.tomcat:annotations-api:6.0.53'
Expand Down
2 changes: 1 addition & 1 deletion docker/backend_alpine.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11.0.22_7-jdk-focal
FROM eclipse-temurin:11.0.22_7-jdk-alpine

LABEL maintainer="[email protected]; [email protected];" \
description="Backend gRPC"
Expand Down

0 comments on commit a6d77b2

Please sign in to comment.