Merge pull request #165 from flofriday/updated-build-action

Modernize Build
SimonHalvdansson · Apr 17, 2024 · 5b92077 · 5b92077
2 parents 2efc6a0 + a91b93a
commit 5b92077
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 17
-      - uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build --warning-mode all
-      - uses: actions/upload-artifact@v3
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+      - name: Build with Gradle
+        run: ./gradlew build --warning-mode all --no-daemon --parallel
+      - uses: actions/upload-artifact@v4
         with:
           name: apks
           path: app/build/outputs/apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,6 +32,9 @@ android {
     lint {
         disable 'NotificationPermission'
     }
+    buildFeatures {
+        buildConfig true
+    }
 
 }
 

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id('com.android.application') version '8.2.0' apply false
+    id('com.android.application') version '8.3.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,6 @@ org.gradle.jvmargs=-Xms1024m -Xmx4096m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.unsafe.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Nov 12 13:07:01 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,9 @@ android { @@
         lint {
             disable 'NotificationPermission'
         }
+        buildFeatures {
+            buildConfig true
+        }
     }
@@ Expand Down @@