Skip to content

Commit 232e555

Browse files
bump to v24 incl. toolchain, jdk8 etc.
1 parent 9f8fdae commit 232e555

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<uses-sdk
2727
android:minSdkVersion="14"
28-
android:targetSdkVersion="23" />
28+
android:targetSdkVersion="24" />
2929

3030
<!-- GET_ACCOUNTS is needed for API < 23.
3131
For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be

build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply plugin: 'pmd'
2020
apply plugin: 'findbugs'
2121

2222
ext {
23-
supportLibraryVersion = '23.4.0'
23+
supportLibraryVersion = '24.1.1'
2424
}
2525

2626
repositories {
@@ -82,8 +82,8 @@ android {
8282
htmlReport true
8383
htmlOutput file("$project.buildDir/reports/lint/lint.html")
8484
}
85-
compileSdkVersion 23
86-
buildToolsVersion "23.0.3"
85+
compileSdkVersion 24
86+
buildToolsVersion "24.0.0"
8787

8888
defaultConfig {
8989
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -94,6 +94,11 @@ android {
9494
testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\""
9595

9696
applicationId "com.nextcloud.client"
97+
98+
// Enable the experimental Jack build tools.
99+
jackOptions {
100+
enabled true
101+
}
97102
}
98103

99104
// adapt structure from Eclipse to Gradle/Android Studio expectations;
@@ -126,8 +131,8 @@ android {
126131
}
127132

128133
compileOptions {
129-
sourceCompatibility JavaVersion.VERSION_1_7
130-
targetCompatibility JavaVersion.VERSION_1_7
134+
sourceCompatibility JavaVersion.VERSION_1_8
135+
targetCompatibility JavaVersion.VERSION_1_8
131136
}
132137

133138
lintOptions {
@@ -137,7 +142,6 @@ android {
137142
packagingOptions {
138143
exclude 'META-INF/LICENSE.txt'
139144
}
140-
141145
task checkstyle(type: Checkstyle) {
142146
configFile = file("${rootProject.projectDir}/checkstyle.xml")
143147
configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath

tests/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-23
14+
target=android-24

0 commit comments

Comments
 (0)