Skip to content

Commit

Permalink
some minor changes (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
inzkhan authored and Nishant-Pathak committed Feb 22, 2018
1 parent 7ec8d14 commit 919b844
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 24 deletions.
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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')
}
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
15 changes: 7 additions & 8 deletions mathview-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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'
}
}
}
Expand All @@ -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'
}

Expand Down

0 comments on commit 919b844

Please sign in to comment.