From 919b8444e12398bbda9eaf054e45844a624b3e43 Mon Sep 17 00:00:00 2001 From: Inzikhan Date: Thu, 22 Feb 2018 10:57:48 +0500 Subject: [PATCH] some minor changes (#4) --- app/build.gradle | 26 ++++++++++++------------ build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- mathview-lib/build.gradle | 15 +++++++------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 72d61f0..2d15b5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ repositories { } android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.2" defaultConfig { applicationId "com.nishant.mathsample" - minSdkVersion 19 - targetSdkVersion 25 + minSdkVersion 17 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -24,16 +24,16 @@ android { } dependencies { - compile 'com.jakewharton:butterknife:8.4.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' - - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.jakewharton:butterknife:8.8.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) -// compile project(path: ':mathview-lib') - compile 'com.github.Nishant-Pathak:MathView:v1.1' -// compile 'com.github.Nishant-Pathak:App-Math:v0.6' - compile 'com.android.support:appcompat-v7:25.2.0' - testCompile 'junit:junit:4.12' + // compile project(path: ':mathview-lib') + implementation 'com.github.Nishant-Pathak:MathView:v1.1' + // compile 'com.github.Nishant-Pathak:App-Math:v0.6' + implementation 'com.android.support:appcompat-v7:27.0.2' + androidTestImplementation 'junit:junit:4.12' + compile project(path: ':mathview-lib') } diff --git a/build.gradle b/build.gradle index c7754bb..91dc8ac 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..a402bc1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Dec 20 20:42:27 PKT 2017 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.1-all.zip diff --git a/mathview-lib/build.gradle b/mathview-lib/build.gradle index c8deb65..a7a94b6 100644 --- a/mathview-lib/build.gradle +++ b/mathview-lib/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion '27.0.2' // publishNonDefault true defaultConfig { minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName '1.0' @@ -18,13 +18,12 @@ android { buildTypes { debug { - consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + //consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + // consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } @@ -43,7 +42,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:appcompat-v7:27.0.2' testCompile 'junit:junit:4.12' }