Android Studio 4.0

pull/996/head
Alex Baker 6 years ago
parent 0f2568e701
commit 404b5c2c07

@ -83,7 +83,7 @@ install:
script: script:
- ./gradlew :app:lintGoogleplayRelease - ./gradlew :app:lintGoogleplayRelease
- ./gradlew :app:jacocoTestReport - ./gradlew :app:jacocoTestReportGoogleplayDebug
- ./gradlew -Pcoverage :app:createGoogleplayDebugAndroidTestCoverageReport - ./gradlew -Pcoverage :app:createGoogleplayDebugAndroidTestCoverageReport
before_cache: before_cache:

@ -6,7 +6,7 @@ plugins {
kotlin("kapt") kotlin("kapt")
id("com.cookpad.android.plugin.license-tools") version "1.2.2" id("com.cookpad.android.plugin.license-tools") version "1.2.2"
id("com.github.ben-manes.versions") version "0.28.0" id("com.github.ben-manes.versions") version "0.28.0"
id("jacoco-android") id("com.vanniktech.android.junit.jacoco") version "0.16.0"
} }
repositories { repositories {
@ -26,8 +26,13 @@ android {
} }
} }
buildFeatures {
viewBinding = true
dataBinding = true
}
lintOptions { lintOptions {
setLintConfig(file("lint.xml")) lintConfig = file("lint.xml")
textOutput("stdout") textOutput("stdout")
textReport = true textReport = true
} }
@ -104,14 +109,6 @@ android {
} }
} }
viewBinding {
isEnabled = true
}
dataBinding {
isEnabled = true
}
packagingOptions { packagingOptions {
exclude("META-INF/*.kotlin_module") exclude("META-INF/*.kotlin_module")
} }

@ -6,12 +6,11 @@ buildscript {
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:3.6.3") classpath("com.android.tools.build:gradle:4.0.0")
classpath("com.google.gms:google-services:4.3.3") classpath("com.google.gms:google-services:4.3.3")
// https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin // https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin
classpath("io.fabric.tools:gradle:1.31.2") classpath("io.fabric.tools:gradle:1.31.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("com.dicedmelon.gradle:jacoco-android:0.1.4")
} }
} }

@ -1,6 +1,6 @@
#Fri Jan 10 14:27:48 CST 2020 #Thu May 28 17:10:25 CDT 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

Loading…
Cancel
Save