Android Studio 3.2.0

asaudkhan · Oct 9, 2018 · fbeea2a · fbeea2a
1 parent a66b6a5
commit fbeea2a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,13 +3,14 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2"
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         // The following dependency has been replaced with newer version according to https://github.com/dcendents/android-maven-plugin
         // classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,5 +20,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git 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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/log/build.gradle b/log/build.gradle
@@ -40,12 +40,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.1'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 4
         versionName "2.1.1"
     }
@@ -58,7 +58,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 afterEvaluate { project ->

diff --git a/log/src/main/AndroidManifest.xml b/log/src/main/AndroidManifest.xml
@@ -1,10 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="no.nordicsemi.android.log"
-    android:versionCode="4"
-    android:versionName="2.0" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="21" />
+<manifest package="no.nordicsemi.android.log">
 
 </manifest>