Gradle improvements (#45)

Author: wborn

.github/workflows/ci_cd.yml

@@ -48,13 +48,13 @@ jobs:
       - name: Run assemble
         if: ${{ !steps.is_main_repo.outputs.value || github.event_name == 'pull_request' }}
         run: |
-          gradle assemble
+          ./gradlew assemble
 
       - name: Run assemble and publish
         if: ${{ steps.is_main_repo.outputs.value && github.event_name != 'pull_request' }}
         run: |
           echo "$KEYSTORE_BASE64" | base64 -d > keystore
-          gradle assemble publishToSonatype closeAndReleaseSonatypeStagingRepository \
+          ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository \
               -PsigningKey=$MAVEN_SIGNING_KEY -PsigningPassword=$MAVEN_SIGNING_PASSWORD -PpublishUsername=$MAVEN_USERNAME -PpublishPassword=$MAVEN_PASSWORD \
               -PkeystoreKeyAlias=$KEYSTORE_KEY_ALIAS -PkeystoreKeyPassword=$KEYSTORE_KEY_PASSWORD -PkeystoreFile=$PWD/keystore -PkeystorePassword=$KEYSTORE_PASSWORD
         env:

.github/workflows/release.yml

@@ -45,9 +45,9 @@ jobs:
         id: release
         run: |
           if [ -n "$VERSION_OVERRIDE" ]; then
-            gradle release -Prelease.forceVersion=${VERSION_OVERRIDE}
+            ./gradlew release -Prelease.forceVersion=${VERSION_OVERRIDE}
           else
-            gradle release -Prelease.versionIncrementer=increment${VERSION_INCREMENT}
+            ./gradlew release -Prelease.versionIncrementer=increment${VERSION_INCREMENT}
           fi
         env:
           VERSION_INCREMENT: ${{ github.event.inputs.VERSION_INCREMENT }}

GenericApp/app/build.gradle

@@ -8,12 +8,12 @@ plugins {
 
 android {
     defaultConfig {
-        applicationId "io.openremote.app"
-        minSdkVersion 25
-        compileSdk 35
-        targetSdkVersion 35
-        versionCode 44
-        versionName version
+        applicationId = "io.openremote.app"
+        minSdkVersion = 25
+        compileSdk = 35
+        targetSdkVersion = 35
+        versionCode = 44
+        versionName = version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -42,19 +42,19 @@ android {
     }
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
         jvmTarget = '17'
     }
 
-    namespace 'io.openremote.app'
+    namespace = 'io.openremote.app'
 
     publishing {
         singleVariant('release') {
@@ -128,8 +128,8 @@ afterEvaluate {
             maven {
                 if (!version.endsWith('-LOCAL')) {
                     credentials {
-                        username findProperty("publishUsername")
-                        password findProperty("publishPassword")
+                        username = findProperty("publishUsername")
+                        password = findProperty("publishPassword")
                     }
                 }
                 url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")

ORLib/build.gradle

@@ -7,14 +7,14 @@ plugins {
 }
 
 android {
-    namespace 'io.openremote.orlib'
+    namespace = 'io.openremote.orlib'
 
     defaultConfig {
-        minSdkVersion 25
-        compileSdk 35
-        targetSdkVersion 35
-        versionCode 1
-        versionName version
+        minSdkVersion = 25
+        compileSdk = 35
+        targetSdkVersion = 35
+        versionCode = 1
+        versionName = version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -35,7 +35,7 @@ android {
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -129,8 +129,8 @@ afterEvaluate {
             maven {
                 if (!version.endsWith('-LOCAL')) {
                     credentials {
-                        username findProperty("publishUsername")
-                        password findProperty("publishPassword")
+                        username = findProperty("publishUsername")
+                        password = findProperty("publishPassword")
                     }
                 }
                 url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")

ORLib/src/test/java/io/openremote/orlib/service/ESPProvisionProviderTest.kt

@@ -57,7 +57,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url 'https://jitpack.io' }
+        maven { url = 'https://jitpack.io' }
     }
 }
 

build.gradle

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists