sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Upgrade android SDK (#144)

Browse Source
This commit is contained in:
Rafał Borcz
2018-07-14 20:09:58 +02:00
committed by Mikołaj Pich
parent 378aba9716
commit b8a31c3faf
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/android-sonarqube.gradle
View File

@ -5,7 +5,7 @@ sonarqube {
//noinspection GroovyAssignabilityCheck
properties {
def files = fileTree("${rootProject.projectDir}/api/build/libs/").filter { it.isFile() }.files.name
def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-26/android.jar," +
def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-27/android.jar," +
"${project.rootDir}/api/build/libs/" + files[0]
property "sonar.projectName", GROUP_ID + ":app"

27
app/build.gradle
View File

@ -1,3 +1,13 @@
apply plugin: 'org.greenrobot.greendao'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' // sync warning probably caused by bug https://issuetracker.google.com/issues/74537216
apply plugin: 'io.fabric'
apply from: 'jacoco.gradle'
apply from: 'android-sonarqube.gradle'
apply plugin: 'com.google.gms.oss.licenses.plugin'
apply plugin: 'com.github.triplet.play'
buildscript {
repositories {
maven { url "https://plugins.gradle.org/m2/" }
@ -17,18 +27,8 @@ repositories {
maven { url 'https://maven.fabric.io/public' }
}
apply plugin: 'org.greenrobot.greendao'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' // sync warning probably caused by bug https://issuetracker.google.com/issues/74537216
apply plugin: 'io.fabric'
apply from: 'jacoco.gradle'
apply from: 'android-sonarqube.gradle'
apply plugin: 'com.google.gms.oss.licenses.plugin'
apply plugin: 'com.github.triplet.play'
android {
compileSdkVersion 26
compileSdkVersion 27
buildToolsVersion '27.0.3'
playAccountConfigs {
@ -42,7 +42,7 @@ android {
applicationId "io.github.wulkanowy"
testApplicationId "io.github.tests.wulkanowy"
minSdkVersion 15
targetSdkVersion 26
targetSdkVersion 27
versionCode 14
versionName "0.5.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -103,6 +103,7 @@ configurations.all {
dependencies {
implementation project(':api')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:design:$supportVersion"
implementation "com.android.support:cardview-v7:$supportVersion"
@ -119,7 +120,6 @@ dependencies {
implementation "com.aurelhubert:ahbottomnavigation:$ahbottom"
implementation "com.jakewharton.threetenabp:threetenabp:$threeTenABP"
implementation "com.google.android.gms:play-services-oss-licenses:$ossLicenses"
implementation "com.jakewharton.timber:timber:$timber"
implementation "at.favre.lib:slf4j-timber:$slf4jTimber"
@ -130,7 +130,6 @@ dependencies {
transitive = true
}
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
kapt "com.google.dagger:dagger-compiler:$dagger2"
kapt "com.google.dagger:dagger-android-processor:$dagger2"
kapt "com.jakewharton:butterknife-compiler:$butterknife"