Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AC-824 Fixed Release version blocker #790

Merged
merged 1 commit into from
Aug 1, 2020
Merged

AC-824 Fixed Release version blocker #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions openmrs-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {

buildTypes {
release {
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
signingConfig signingConfigs.release
}
Expand Down Expand Up @@ -141,14 +141,13 @@ dependencies {
// Database components
implementation "androidx.room:room-runtime:${versions.roomRuntime}"
implementation "android.arch.persistence.room:rxjava2:${versions.roomPersistence}"
//noinspection GradleDependency
// Noinspection GradleDependency
annotationProcessor "androidx.room:room-compiler:${versions.roomCompiler}"
implementation "net.zetetic:android-database-sqlcipher:${versions.sqlcipher}"

// Work Manager
implementation "androidx.work:work-runtime:${versions.workManager}"

//http request Chuck Library
// http request Chuck Library
testImplementation "com.readystatesoftware.chuck:library:${versions.chuckLibrary}"
debugImplementation "com.readystatesoftware.chuck:library:${versions.chuckLibrary}"
releaseImplementation "com.readystatesoftware.chuck:library-no-op:${versions.chuckLibrary}"
Expand All @@ -172,9 +171,9 @@ dependencies {
implementation "org.jdeferred:jdeferred-android-aar:${versions.jdeferred}"
implementation "com.google.guava:guava:${versions.guava}"

//Leak Canary
// Leak Canary
debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}"
//google place api
// Google place api
implementation "com.google.android.libraries.places:places:${versions.placesAPI}"

// Test Implementations
Expand Down
7 changes: 0 additions & 7 deletions openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import androidx.multidex.MultiDexApplication;

import net.sqlcipher.database.SQLiteDatabase;

import org.mindrot.jbcrypt.BCrypt;
import org.openmrs.mobile.api.FormListService;
import org.openmrs.mobile.services.AuthenticateCheckService;
Expand All @@ -46,7 +44,6 @@ public static OpenMRS getInstance() {

@Override
public void onCreate() {
initializeSQLCipher();
super.onCreate();
instance = this;
if (mExternalDirectoryPath == null) {
Expand Down Expand Up @@ -278,10 +275,6 @@ public boolean isRunningKitKatVersionOrHigher() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
}

private void initializeSQLCipher() {
SQLiteDatabase.loadLibs(this);
}

public void clearUserPreferencesData() {
SharedPreferences prefs = OpenMRS.getInstance().getOpenMRSSharedPreferences();
SharedPreferences.Editor editor = prefs.edit();
Expand Down
1 change: 0 additions & 1 deletion openmrs-client/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ versions.countryCodePicker = '2.4.0'
versions.AppIntro = '6.0.0'

versions.codec = '1.10'
versions.sqlcipher = '4.1.3@aar'
versions.jdeferred = '1.2.6'
versions.legacySupport = '1.0.0'
versions.multidex = '2.0.1'
Expand Down