Skip to content

Commit

Permalink
Issue #SB-000 merge: Merge pull request #1170 from swayangjit/release…
Browse files Browse the repository at this point in the history
…-3.2.0

Issue #SB-000 merge: Merge branch 'release-3.2.0_proguard' into release-3.2.0
  • Loading branch information
swayangjit authored Jul 28, 2020
2 parents 8977b32 + b57c4f9 commit 76cb736
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 2 deletions.
3 changes: 2 additions & 1 deletion build_config
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ cordova-plugin=cordova-plugin-android-permissions
cordova-plugin=cordova-plugin-media
cordova-plugin=cordova.plugins.diagnostic
cordova-plugin=com.telerik.plugins.nativepagetransitions
cordova-plugin=https://github.com/greybax/cordova-plugin-proguard.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-3.1.0
Expand All @@ -29,4 +30,4 @@ sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-openrap
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-file-support.git
sunbird-cordova-plugin=https://github.com/project-sunbird/sb-cordova-plugin-sync.git
sunbird-cordova-plugin=https://github.com/swayangjit/sb-cordova-plugin-sync.git#release-3.1.0
1 change: 1 addition & 0 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,5 @@
<plugin name="cordova-plugin-file-support" spec="https://github.com/project-sunbird/cordova-plugin-file-support.git" />
<plugin name="sb-cordova-plugin-sync" spec="https://github.com/project-sunbird/sb-cordova-plugin-sync.git" />
<engine name="android" spec="^8.1.0" />
<plugin name="cordova-plugin-proguard" spec="https://github.com/greybax/cordova-plugin-proguard.git" />
</widget>
4 changes: 4 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"cordova-plugin-network-information": "^2.0.2",
"cordova-plugin-openrap": "git+https://github.com/project-sunbird/cordova-plugin-openrap.git",
"cordova-plugin-printer": "^0.8.0",
"cordova-plugin-proguard": "git+https://github.com/greybax/cordova-plugin-proguard.git",
"cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git",
"cordova-plugin-screen-orientation": "^3.0.2",
"cordova-plugin-statusbar": "^2.4.3",
Expand Down Expand Up @@ -198,7 +199,8 @@
"ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher"
},
"com.telerik.plugins.nativepagetransitions": {},
"sb-cordova-plugin-sync": {}
"sb-cordova-plugin-sync": {},
"cordova-plugin-proguard": {}
},
"platforms": [
"android"
Expand Down
69 changes: 69 additions & 0 deletions proguard-custom.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@

-dontwarn java.awt.**,javax.swing.**
-dontwarn org.mozilla.javascript.tools.**
-dontwarn com.nimbusds.jose.crypto.**
-dontwarn com.nimbusds.jose.jwk.ECKey.**
-dontwarn com.nimbusds.jose.**
-dontwarn com.nimbusds.jwt.**
-dontwarn okhttp3.**
-dontwarn okio.**
-dontwarn javax.annotation.**
-dontwarn org.conscrypt.**
#Keep ADAL classes
-keep class com.microsoft.aad.adal.** { *; }
-keep class com.microsoft.identity.common.** { *; }
#Keep Gson for ADAL https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg
-keepattributes Signature
-keepattributes *Annotation*
-dontwarn sun.misc.**
-keep class com.google.gson.examples.android.model.** { *; }
-keep class * implements com.google.gson.** {*;}
-dontwarn org.bouncycastle.**
-keepnames class com.fasterxml.jackson.databind.** { *; }
-dontwarn com.fasterxml.jackson.databind.*
-keepattributes InnerClasses
-keep class org.bouncycastle.** { *; }
-keepnames class org.bouncycastle.* { *; }
-dontwarn org.bouncycastle.*
-keep class io.jsonwebtoken.** { *; }
-keepnames class io.jsonwebtoken.* { *; }
-keepnames interface io.jsonwebtoken.* { *; }
-dontwarn javax.xml.bind.DatatypeConverter
-dontwarn io.jsonwebtoken.impl.Base64Codec
-keepnames class com.fasterxml.jackson.** { * ; }
-keepnames interface com.fasterxml.jackson.** { *; }
-keep class org.sunbird.app.BuildConfig { *;}
-keep class android.webkit.WebViewFactory { *; }
-dontnote android.net.http.*
-dontnote org.apache.commons.codec.**
-dontnote org.apache.http.**
-keep class com.google.android.gms.** { *; }
-keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; }
-keepclassmembers class com.journeyapps.barcodescanner.** { *; }
-keep,includedescriptorclasses class androidx.mediaandroid.webkit.WebViewFactory.** { *; }
-keepclassmembers class androidx.media.** { *; }
-keep class androidx.versionedparcelable.VersionedParcel
-dontnote android.webkit.WebViewFactory
-dontnote me.leolin.shortcutbadger.impl.AsusHomeLauncher
-dontnote me.leolin.shortcutbadger.impl.SolidHomeBadger
-dontnote com.android.org.conscrypt.SSLParametersImpl
-dontnote org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
-dontnote org.conscrypt.ConscryptEngineSocket
-dontnote sun.security.ssl.SSLContextImpl
-dontnote org.crosswalk.engine.XWalkWebViewEngine
-dontnote com.google.firebase.crash.FirebaseCrash
-dontnote me.leolin.shortcutbadger.impl.XiaomiHomeBadger
-dontnote okhttp3.internal.platform.AndroidPlatform$CloseGuard
-dontnote com.google.android.gms.internal.measurement.**

-keepclassmembers class com.google.android.gms.** { *; }
-dontnote android.os.**
-dontnote com.google.android.gms.ads.AdView
-dontnote com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian
-dontnote com.google.android.gms.tagmanager.TagManagerService
-dontnote com.google.android.gms.common.api.internal.BasePendingResult
-dontnote com.google.android.gms.gcm.GcmListenerService

-keep class com.google.android.gms.** { *; }
-keep public class com.google.android.gms.* { public *; }
-dontwarn com.google.android.gms.**

0 comments on commit 76cb736

Please sign in to comment.