(logging-log4j-samples) branch main updated: Pass arguments to Gradle via environment variables (#314)

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git


The following commit(s) were added to refs/heads/main by this push:
     new d41d789  Pass arguments to Gradle via environment variables (#314)
d41d789 is described below

commit d41d789df0ca950fe67a979e8b26d78840b65fab
Author: Piotr P. Karwasz <pkarwasz-git...@apache.org>
AuthorDate: Tue Apr 15 11:44:48 2025 +0200

    Pass arguments to Gradle via environment variables (#314)
    
    This PR passes arguments to the Gradle builds via the `LOG4J_VERSION` and 
`LOG4J_REPOSITORY_URL` environment variables.
    
    This simplifies the build, since no command line parameters need to be used.
---
 .github/workflows/gradle-reusable-test.yaml | 4 ----
 log4j-samples-android/app/build.gradle      | 2 +-
 log4j-samples-gradle-metadata/build.gradle  | 2 +-
 settings.gradle                             | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-reusable-test.yaml 
b/.github/workflows/gradle-reusable-test.yaml
index ca77718..00e11bf 100644
--- a/.github/workflows/gradle-reusable-test.yaml
+++ b/.github/workflows/gradle-reusable-test.yaml
@@ -71,8 +71,6 @@ jobs:
           LOG4J_REPOSITORY_URL: ${{ inputs.log4j-repository-url }}
         run: |
           ./gradlew \
-          -Plog4j.version=$LOG4J_VERSION \
-          -Plog4j.repository.url=$LOG4J_REPOSITORY_URL \
           :log4j-samples-gradle-metadata:check
 
       - name: Enable KVM
@@ -129,8 +127,6 @@ jobs:
           LOG4J_REPOSITORY_URL: ${{ inputs.log4j-repository-url }}
         run: |
           ./gradlew \
-          -Plog4j.version=$LOG4J_VERSION \
-          -Plog4j.repository.url=$LOG4J_REPOSITORY_URL \
           :app:build :app:connectedCheck
 
       - name: Remove AVD Device
diff --git a/log4j-samples-android/app/build.gradle 
b/log4j-samples-android/app/build.gradle
index 383951f..48d6707 100644
--- a/log4j-samples-android/app/build.gradle
+++ b/log4j-samples-android/app/build.gradle
@@ -49,7 +49,7 @@ android {
     }
 }
 
-def log4jVersion = providers.gradleProperty("log4j.version").get()
+def log4jVersion = 
providers.environmentVariable("LOG4J_VERSION").getOrElse("2.+")
 
 dependencies {
 
diff --git a/log4j-samples-gradle-metadata/build.gradle 
b/log4j-samples-gradle-metadata/build.gradle
index 297b9c9..0e3401c 100644
--- a/log4j-samples-gradle-metadata/build.gradle
+++ b/log4j-samples-gradle-metadata/build.gradle
@@ -18,7 +18,7 @@ plugins {
     id("application")
 }
 
-def log4jVersion = providers.gradleProperty("log4j.version").getOrElse("2.+")
+def log4jVersion = 
providers.environmentVariable("LOG4J_VERSION").getOrElse("2.+")
 
 application {
     mainModule = "org.example.log4j.metadata"
diff --git a/settings.gradle b/settings.gradle
index 6883315..a5ccc36 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,7 +28,7 @@ dependencyResolutionManagement {
         mavenCentral()
         // Points to the correct Apache staging repository
         var apacheSnapshots = 'https://repository.apache.org/snapshots'
-        var repositoryUrl = providers.gradleProperty('log4j.repository.url')
+        var repositoryUrl = 
providers.environmentVariable('LOG4J_REPOSITORY_URL')
                 .filter { !it.isEmpty() }
                 .getOrElse(apacheSnapshots)
         maven {