Skip to content

Commit f74d967

Browse files
Merge pull request #1264 from nextcloud/update-gradle-settings
Upgrade target sdk and update gradle settings
2 parents 35c10af + 1f9f913 commit f74d967

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

gradle.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,10 @@ android.useAndroidX=true
88
android.defaults.buildfeatures.buildconfig=true
99
android.nonTransitiveRClass=false
1010
android.nonFinalResIds=false
11+
12+
# JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
13+
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
kotlin.daemon.jvmargs=-Xmx4096m
15+
org.gradle.caching=true
16+
org.gradle.parallel=true
17+
org.gradle.configureondemand=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Sep 16 08:12:41 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ tasks.withType(SpotBugsTask){task ->
103103
}
104104

105105
android {
106-
compileSdkVersion 33
106+
compileSdk 34
107107

108108
buildTypes {
109109
debug {
@@ -121,7 +121,7 @@ android {
121121

122122
defaultConfig {
123123
minSdkVersion 14
124-
targetSdkVersion 32
124+
targetSdkVersion 34
125125

126126
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
127127
testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"

sample_client/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repositories {
1717
}
1818

1919
android {
20-
compileSdkVersion 33
20+
compileSdk 34
2121

2222
lintOptions {
2323
abortOnError false
@@ -28,7 +28,7 @@ android {
2828
}
2929
defaultConfig {
3030
minSdkVersion 14
31-
targetSdkVersion 33
31+
targetSdkVersion 34
3232

3333
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3434
}

0 commit comments

Comments
 (0)