Skip to content

Commit

Permalink
Merge pull request #21 from Teknasyon-Teknoloji/feature/pro-guard
Browse files Browse the repository at this point in the history
[feature] Add to proguard/r8 rules
  • Loading branch information
baranoguz authored Jul 18, 2022
2 parents d5cc693 + 087b02c commit b73e9e0
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
/build
/captures
.externalNativeBuild
.idea/sonarlint/
.idea/sonarlint/issuestore/index.pb
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changelog

All notable changes to this project will be documented in this file.


## 1.0.7 (2022-07-18)
### Added
- Add proguard/r8 rules
4 changes: 2 additions & 2 deletions desk360/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'org.jetbrains.dokka-android'
apply plugin: 'maven-publish'
def sdkArtifactId = 'desk360-android-sdk'
def sdkGroupId = 'com.github.Teknasyon-Teknoloji'
def sdkVersionName = "1.0.6"
def sdkVersionName = "1.0.7"

android {
compileSdkVersion 30
Expand All @@ -17,7 +17,7 @@ android {
targetSdkVersion 30
versionCode 6
versionName sdkVersionName

consumerProguardFiles "consumer-rules.pro"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 4 additions & 0 deletions desk360/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-keep class com.teknasyon.desk360.model.** { *; }
-keepnames class com.teknasyon.desk360.model.** { *; }
-keep class com.teknasyon.desk360.modelv2.** { *; }
-keepnames class com.teknasyon.desk360.modelv2.** { *; }
7 changes: 1 addition & 6 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@ android {

buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
buildConfigField "String", "APP_KEY", '"IMVmTejgQKYDGuaMApqDdvV0IQSgNA34"'
buildConfigField "String", "DESK360_BASE_URL", '"http://teknasyon.desk360.com/"'


}

debug {
minifyEnabled false
buildConfigField "String", "APP_KEY", '"IMVmTejgQKYDGuaMApqDdvV0IQSgNA34"'
buildConfigField "String", "DESK360_BASE_URL", ' "http://52.59.142.138:10380/"'

}
}

Expand Down

0 comments on commit b73e9e0

Please sign in to comment.