From 5535c91d20a1b0957c4fa4273acab5196e6d7d24 Mon Sep 17 00:00:00 2001 From: Nishant Pathak Date: Thu, 22 Feb 2018 11:50:23 +0530 Subject: [PATCH] updated readme, dependency and fixed build pipeline --- .travis.yml | 2 +- README.md | 12 ++++++++++-- app/build.gradle | 16 ++++++++-------- app/proguard-rules.pro | 5 +++++ mathview-lib/build.gradle | 2 +- mathview-lib/proguard-rules.pro | 3 --- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f77f8a..8a9589a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ android: components: - platform-tools - tools - - build-tools-25.0.2 + - build-tools-27.0.3 - android-25 - extra-android-support - extra-android-m2repository diff --git a/README.md b/README.md index 2e19c43..df833ee 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,14 @@ dependencies { Usage ----- -In your layout: +###In your layout: ```xml ``` -In Activity: +###In Activity: ```java @BindView(R.id.math_view) MathView mathView; @@ -56,6 +56,14 @@ In Activity: } ``` + +###Proguard-rules: +``` + +-keepattributes EnclosingMethod +-keep class com.nishant.** { *; } +``` + License ======= Copyright (C) 2016 - 2017 Nishant Pathak diff --git a/app/build.gradle b/app/build.gradle index 2d15b5d..f20f11e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,18 +6,18 @@ repositories { android { compileSdkVersion 27 - buildToolsVersion "27.0.2" + buildToolsVersion '27.0.3' defaultConfig { - applicationId "com.nishant.mathsample" + applicationId 'com.nishant.mathsample' minSdkVersion 17 targetSdkVersion 27 versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionName '1.0' + testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -30,9 +30,9 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - // compile project(path: ':mathview-lib') - implementation 'com.github.Nishant-Pathak:MathView:v1.1' - // compile 'com.github.Nishant-Pathak:App-Math:v0.6' + + // compile project(path: ':mathview-lib') + implementation 'com.github.Nishant-Pathak:MathView:v1.2' implementation 'com.android.support:appcompat-v7:27.0.2' androidTestImplementation 'junit:junit:4.12' compile project(path: ':mathview-lib') diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 84412ee..edafb40 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,8 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +#------------- MathView Start ------------------- +-keepattributes EnclosingMethod +-keep class com.nishant.** { *; } +#------------- MathView End ------------------- \ No newline at end of file diff --git a/mathview-lib/build.gradle b/mathview-lib/build.gradle index a7a94b6..722e35c 100644 --- a/mathview-lib/build.gradle +++ b/mathview-lib/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' // publishNonDefault true defaultConfig { diff --git a/mathview-lib/proguard-rules.pro b/mathview-lib/proguard-rules.pro index 7526e02..84412ee 100644 --- a/mathview-lib/proguard-rules.pro +++ b/mathview-lib/proguard-rules.pro @@ -15,6 +15,3 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} - --keepattributes EnclosingMethod --keep class com.nishant.** { *; } \ No newline at end of file