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.

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

added android X migration and implemented BS date picker #622

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 27 additions & 7 deletions android-json-form-wizard/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ jacoco {
reportsDir = file("$buildDir/reports/jacoco")
}

configurations {
cleanedAnnotations
compile.exclude group: 'org.jetbrains' , module:'annotations-java5'
// compile.exclude group: 'com.intellij', module:'annotations'
// compile.exclude group: 'org.intellij', module:'annotations'
}


android {
compileSdkVersion androidCompileSdkVersion
buildToolsVersion androidBuildToolsVersion
Expand Down Expand Up @@ -66,11 +74,18 @@ android {
resolutionStrategy.force 'com.android.support:design:28.0.0'
}
}

configurations {
cleanedAnnotations
implementation.exclude group: 'org.jetbrains' , module:'annotations'
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}
configurations {
cleanedAnnotations
compile.exclude group: 'org.jetbrains' , module:'annotations'
}

repositories {
mavenCentral()
Expand All @@ -84,7 +99,7 @@ dependencies {
exclude group: 'com.android.support', module: 'design'
}
implementation 'com.github.bmelnychuk:atv:1.2.9'
implementation('com.android.support:design:28.0.0') {
implementation('com.google.android.material:material:1.0.0') {
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'support-v4'
Expand All @@ -93,7 +108,7 @@ dependencies {
implementation 'com.github.johnkil.print:print:1.3.1'
implementation 'com.github.rey5137:material:1.2.5'
implementation 'org.smartregister:opensrp-client-materialedittext:2.1.6-SNAPSHOT'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation('com.github.ganfra:material-spinner:2.0.0') {
exclude group: 'com.nineoldandroids', module: 'library'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand Down Expand Up @@ -138,7 +153,8 @@ dependencies {
}
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.1'


// PowerMock
def powerMockVersion = '2.0.4'
Expand All @@ -154,18 +170,22 @@ dependencies {
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation("com.android.support.test:runner:1.0.2") {
androidTestImplementation('androidx.test.ext:junit:1.1.1') {
exclude group: 'com.android.support', module: 'appcompat-v7'

}
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2', {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestImplementation('com.android.support.test:rules:1.0.2') {
androidTestImplementation('androidx.test:rules:1.1.1') {
exclude group: 'com.android.support', module: 'appcompat-v7'

}

implementation ('com.github.keyrunHORNET:date_picker_converter:3.0.0') {
exclude group: 'com.android.support', module: 'support-annotations'
}

testImplementation 'junit:junit:4.12'
testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
testImplementation 'org.mockito:mockito-core:3.1.0'
Expand Down
3 changes: 2 additions & 1 deletion android-json-form-wizard/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
POM_SETTING_NAME=OpenSRP Client Native Form Json
POM_SETTING_ARTIFACT_ID=opensrp-client-native-form
POM_SETTING_PACKAGING=aar
POM_SETTING_PACKAGING=aar
org.gradle.jvmargs=-Xmx4096m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vijay.jsonwizard;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import org.smartregister.client.utils.contract.ClientFormContract;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import android.widget.Toast;

import com.vijay.jsonwizard.NativeFormLibrary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import android.graphics.drawable.GradientDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.util.Pair;
import android.support.v7.widget.AppCompatRadioButton;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.core.util.Pair;
import androidx.appcompat.widget.AppCompatRadioButton;
import android.text.Html;
import android.text.Spanned;
import android.text.TextUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.appcompat.widget.Toolbar;
import android.view.View;

import com.google.gson.Gson;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vijay.jsonwizard.activities;

import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;

import com.vijay.jsonwizard.utils.NativeFormLangUtils;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vijay.jsonwizard.adapter;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vijay.jsonwizard.adapter;

import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vijay.jsonwizard.adapter;

import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Loading