mirror of
https://github.com/nextcloud/android.git
synced 2024-10-22 20:16:02 +03:00
bump to v24 incl. toolchain, jdk8 etc.
This commit is contained in:
parent
9f8fdaeac0
commit
232e555cd3
3 changed files with 12 additions and 8 deletions
|
@ -25,7 +25,7 @@
|
|||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="14"
|
||||
android:targetSdkVersion="23" />
|
||||
android:targetSdkVersion="24" />
|
||||
|
||||
<!-- GET_ACCOUNTS is needed for API < 23.
|
||||
For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be
|
||||
|
|
16
build.gradle
16
build.gradle
|
@ -20,7 +20,7 @@ apply plugin: 'pmd'
|
|||
apply plugin: 'findbugs'
|
||||
|
||||
ext {
|
||||
supportLibraryVersion = '23.4.0'
|
||||
supportLibraryVersion = '24.1.1'
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
@ -82,8 +82,8 @@ android {
|
|||
htmlReport true
|
||||
htmlOutput file("$project.buildDir/reports/lint/lint.html")
|
||||
}
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.3"
|
||||
compileSdkVersion 24
|
||||
buildToolsVersion "24.0.0"
|
||||
|
||||
defaultConfig {
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
|
@ -94,6 +94,11 @@ android {
|
|||
testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\""
|
||||
|
||||
applicationId "com.nextcloud.client"
|
||||
|
||||
// Enable the experimental Jack build tools.
|
||||
jackOptions {
|
||||
enabled true
|
||||
}
|
||||
}
|
||||
|
||||
// adapt structure from Eclipse to Gradle/Android Studio expectations;
|
||||
|
@ -126,8 +131,8 @@ android {
|
|||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_7
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
|
@ -137,7 +142,6 @@ android {
|
|||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE.txt'
|
||||
}
|
||||
|
||||
task checkstyle(type: Checkstyle) {
|
||||
configFile = file("${rootProject.projectDir}/checkstyle.xml")
|
||||
configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath
|
||||
|
|
|
@ -11,4 +11,4 @@
|
|||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||
|
||||
# Project target.
|
||||
target=android-23
|
||||
target=android-24
|
||||
|
|
Loading…
Reference in a new issue