Skip to content

Commit

Permalink
Merge pull request #127 from ostdotcom/develop
Browse files Browse the repository at this point in the history
Preparing for Release
  • Loading branch information
AniketAyachit authored Sep 24, 2019
2 parents 9812d20 + 3ba193e commit 73ec85f
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# OST Wallet SDK Changelog

## Version 2.3.3
### Changes:
* Proguard usage to remove verbose and debug logs.

## Version 2.3.2
### Bug Fixes:
* Fixed a bug where some android phones were not able to provide pin.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ compileOptions {

```
dependencies {
implementation 'com.ost:ost-wallet-sdk-android:2.3.0'
implementation 'com.ost:ost-wallet-sdk-android:2.3.3'
...
...
...
Expand Down
8 changes: 7 additions & 1 deletion ostsdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
apply plugin: 'com.android.library'
apply from: 'maven-push.gradle'

/**
* Run Proguard to shrink the Java bytecode in release builds.
*/
def enableProguardInReleaseBuilds = true

android {
compileSdkVersion 28
defaultConfig {
Expand Down Expand Up @@ -40,7 +45,8 @@ android {

buildTypes {
release {
minifyEnabled false
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
Expand Down
4 changes: 2 additions & 2 deletions ostsdk/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
# org.gradle.parallel=true

#Increase version when publishing.
VERSION_NAME=2.3.2
VERSION_NAME=2.3.3
#Increase version code when publishing.
VERSION_CODE=36
VERSION_CODE=38

#Everything else.
GROUP=com.ost
Expand Down
4 changes: 4 additions & 0 deletions ostsdk/proguard-android-optimize.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Don't do arithmetic and variable simplification
-optimizations !code/simplification/arithmetic,!code/allocation/variable
#Number of Optimization passes
-optimizationpasses 5
22 changes: 15 additions & 7 deletions ostsdk/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,19 @@
# hide the original source file name.
#-renamesourcefileattribute SourceFile

# This will strip `Log.v`, `Log.d`, and `Log.i` statements and will leave `Log.w` and `Log.e` statements intact.

#Don't mix class names
-dontusemixedcaseclassnames
#Don't ignore non-public library classes.
-dontskipnonpubliclibraryclasses
-dontpreverify
#show logs
-verbose
#Don't obfuscate the input class files.
-keep class **
-keepclassmembers class *{*;}
-keepattributes *
#strip down debug and verbose logs
-assumenosideeffects class android.util.Log {
public static boolean isLoggable(java.lang.String, int);
public static int v(...);
public static int d(...);
public static int i(...);
}
public static *** d(...);
public static *** v(...);
}

0 comments on commit 73ec85f

Please sign in to comment.