Skip to content

Commit

Permalink
Merge pull request #1329 from Strubbl/update-to-gradle-8
Browse files Browse the repository at this point in the history
update to gradle 8
  • Loading branch information
tcitworld authored Oct 17, 2023
2 parents d6d37b2 + ffb97f9 commit e1dd613
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Setup Java JDK
uses: actions/setup-java@v3.12.0
with:
java-version: 11
java-version: '17'
distribution: 'temurin'

- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.1'
}
}
Expand All @@ -21,7 +21,7 @@ allprojects {

tasks {
wrapper {
gradleVersion = "7.0.2"
gradleVersion = "8.3"
distributionType = Wrapper.DistributionType.ALL
}
}
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit e1dd613

Please sign in to comment.