diff --git a/.travis.yml b/.travis.yml index 55d3d5f1..bdc01ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: android android: components: - platform-tools - - build-tools-26.0.0 - - android-26 + - build-tools-26.0.2 + - android-27 - extra-android-m2repository addons: sonarcloud: diff --git a/Makefile b/Makefile index d0c321f0..5543867b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE = de.markusfisch.android.binaryeye -APK = app/build/outputs/apk/app-debug.apk +APK = app/build/outputs/apk/debug/app-debug.apk all: debug install start diff --git a/build.gradle b/build.gradle index fe816bfb..ea8e9ca3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,13 @@ buildscript { ext.kotlin_version = '1.1.51' - ext.tools_version = '2.3.3' - ext.build_tools_version = '26.0.0' - ext.sdk_version = 26 + ext.tools_version = '3.0.0' + ext.build_tools_version = '26.0.2' + ext.sdk_version = 27 ext.support_version = '25.3.1' repositories { jcenter() + google() mavenCentral() maven { url "https://plugins.gradle.org/m2/" @@ -15,18 +16,19 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:$tools_version" - classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8' + classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } plugins { - id 'org.sonarqube' version '2.5' + id 'org.sonarqube' version '2.6' } allprojects { repositories { jcenter() + google() } gradle.projectsEvaluated { diff --git a/cameraview/build.gradle b/cameraview/build.gradle index 331db076..64fbfbb8 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -1,6 +1,7 @@ buildscript { repositories { jcenter() + google() } dependencies { @@ -21,6 +22,11 @@ android { versionCode 5 versionName '1.3.0' } + + buildTypes { + debug + release + } } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eaba3011..649480dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip