diff --git a/app/build.gradle b/app/build.gradle index 1de1f496..253302ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion '26.0.2' + buildToolsVersion "27.0.1" defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 18 targetSdkVersion 27 - versionCode 65 - versionName "2.5.3" + versionCode 66 + versionName "2.6.0" resConfigs "en" } buildTypes { diff --git a/build.gradle b/build.gradle index 378ae46b..d83d7bac 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/common/build.gradle b/common/build.gradle index 2b1c8034..97b1533a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,30 +1,7 @@ -/* - * Copyright (c) 2015, Nordic Semiconductor - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - apply plugin: 'com.android.library' android { compileSdkVersion 27 - buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 18 diff --git a/wear/build.gradle b/wear/build.gradle index d8cc5eb8..13741ef2 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -4,14 +4,13 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion "26.0.2" defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 23 targetSdkVersion 27 - versionCode 272536501 // target: 26, version: 2.5.3, build: 65, multi-APK: 01 - versionName "2.5.3" + versionCode 272606601 // target: 27, version: 2.6.0, build: 66, multi-APK: 01 + versionName "2.6.0" resConfigs "en" } lintOptions {