From 53931b883d9c778de4d6274bcd7e8b48ad7f563f Mon Sep 17 00:00:00 2001 From: Shulhan Date: Thu, 17 Aug 2023 20:33:15 +0700 Subject: all: set the makedepends to use JDK v17 Using java-environment will install JDK v20 which cause the package failed to build with the following error: Unknown Kotlin JVM target: 20 This changes set the java dependency to v17. --- .SRCINFO | 9 +++++---- PKGBUILD | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 499a68a..51be88d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,16 @@ pkgbase = google-cloud-ops-agent-git pkgdesc = Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring) - pkgver = 2.34.0.r34.gfdcfea1a4 - pkgrel = 2 + pkgver = 2.37.0.r5.g5eee229a3 + pkgrel = 1 url = https://github.com/GoogleCloudPlatform/ops-agent arch = x86_64 arch = aarch64 license = Apache License 2.0 makedepends = cmake - makedepends = go makedepends = git - makedepends = java-environment + makedepends = go + makedepends = gradle + makedepends = jdk17-openjdk makedepends = pkg-config makedepends = rsync makedepends = unzip diff --git a/PKGBUILD b/PKGBUILD index 0f59610..67163e1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: shulhan pkgname=google-cloud-ops-agent-git -pkgver=2.34.0.r34.gfdcfea1a4 -pkgrel=2 +pkgver=2.37.0.r5.g5eee229a3 +pkgrel=1 pkgdesc="Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring)" arch=('x86_64' 'aarch64') @@ -15,9 +15,10 @@ depends=( ) makedepends=( 'cmake' - 'go' 'git' - 'java-environment' + 'go' + 'gradle' + 'jdk17-openjdk' 'pkg-config' 'rsync' 'unzip' -- cgit v1.3