Merge pull request #14 from G00fY2/develop

Develop
G00fY2 · May 6, 2023 · 2cb6d51 · 2cb6d51
2 parents 10e9907 + 1197bb3
commit 2cb6d51
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,19 +3,23 @@ on:
   push:
     branches:
       - develop
-      - master
+      - main
   pull_request:
     branches:
       - develop
-      - master
+      - main
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  id("com.android.application") version "7.0.4" apply false
-  kotlin("android") version "1.6.10" apply false
+  id("com.android.application") version "7.1.3" apply false
+  kotlin("android") version "1.6.21" apply false
   id("org.sonarqube") version "3.3"
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-  compileSdk = 31
+  compileSdk = 32
   defaultConfig {
     applicationId = "io.github.g00fy2.versioncomparesample"
     minSdk = 14
-    targetSdk = 31
+    targetSdk = 32
     versionCode = 1
     versionName = "1.0"
   }

diff --git a/versioncompare/build.gradle.kts b/versioncompare/build.gradle.kts
@@ -11,7 +11,7 @@ java {
 }
 
 jacoco {
-  toolVersion = "0.8.7"
+  toolVersion = "0.8.8"
 }
 
 tasks.test {
@@ -34,7 +34,7 @@ dependencies {
   compileOnly("org.jetbrains:annotations:23.0.0")
 
   testImplementation("junit:junit:4.13.2")
-  testImplementation("nl.jqno.equalsverifier:equalsverifier:3.8.1")
+  testImplementation("nl.jqno.equalsverifier:equalsverifier:3.10")
 }
 
 group = "io.github.g00fy2"