diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index e7bedf3..c1e2ebc 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +1,7 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5e20365..66e2f6f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
-
-
-
-
-
-
-
-
- Android > Lint > Correctness
-
-
- Android > Lint > Performance
-
-
- Android > Lint > Security
-
-
- C/C++
-
-
- Code style issuesJava
-
-
- Compiler issuesJava
-
-
- Declaration orderC/C++
-
-
- Finalization issuesJava
-
-
- Groovy
-
-
- Inheritance issuesJava
-
-
- J2ME issuesJava
-
-
- Java
-
-
- Java language level migration aidsJava
-
-
- JavaBeans issuesJava
-
-
- Numeric issuesJava
-
-
- OtherGroovy
-
-
- Performance issuesJava
-
-
- Probable bugsJava
-
-
- Security issuesJava
-
-
- Serialization issuesJava
-
-
- Type checksC/C++
-
-
- Verbose or redundant code constructsJava
-
-
-
-
- Android
-
-
-
-
-
-
+
-
-
-
-
- 1.8
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8701f8e..6527043 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,11 +3,8 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 80b3c5c..b0268b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.3'
+ compileSdkVersion 28
defaultConfig {
applicationId "com.ajts.androidmads.sqlite2xlDemo"
minSdkVersion 15
- targetSdkVersion 26
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
}
@@ -19,11 +18,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile project(path: ':library')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation project(path: ':library')
// compile 'com.ajts.androidmads.SQLite2Excel:library:1.0.1'
- compile 'com.android.support:appcompat-v7:26.1.0'
- compile 'com.android.support:design:26.1.0'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'com.google.android.material:material:1.0.0'
}
repositories {
mavenCentral()
diff --git a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/Excel2SQLiteActivity.java b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/Excel2SQLiteActivity.java
index 265638d..3f34200 100644
--- a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/Excel2SQLiteActivity.java
+++ b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/Excel2SQLiteActivity.java
@@ -2,7 +2,6 @@
import android.os.Bundle;
import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
@@ -15,6 +14,8 @@
import java.io.File;
+import androidx.appcompat.app.AppCompatActivity;
+
public class Excel2SQLiteActivity extends AppCompatActivity {
EditText edtFilePath;
diff --git a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/MainActivity.java b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/MainActivity.java
index 37af6c5..ef91e71 100644
--- a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/MainActivity.java
+++ b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/MainActivity.java
@@ -6,13 +6,14 @@
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+
public class MainActivity extends AppCompatActivity {
@Override
diff --git a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/SQLite2ExcelActivity.java b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/SQLite2ExcelActivity.java
index 92179d9..f19ccd6 100644
--- a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/SQLite2ExcelActivity.java
+++ b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/SQLite2ExcelActivity.java
@@ -5,7 +5,6 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
@@ -26,6 +25,8 @@
import java.util.HashMap;
import java.util.List;
+import androidx.appcompat.app.AppCompatActivity;
+
public class SQLite2ExcelActivity extends AppCompatActivity {
EditText edtUser, edtContactNo;
diff --git a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/adapter/CustomAdapter.java b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/adapter/CustomAdapter.java
index 1aaa7b4..fd1eee3 100644
--- a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/adapter/CustomAdapter.java
+++ b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/adapter/CustomAdapter.java
@@ -2,15 +2,10 @@
import android.annotation.SuppressLint;
import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
-import android.util.Base64;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
-import android.widget.ImageView;
import android.widget.TextView;
import com.ajts.androidmads.sqlite2xlDemo.R;
@@ -19,6 +14,8 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+
/**
* Created by Mushtaq on 12-04-2017.
*/
diff --git a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/util/Utils.java b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/util/Utils.java
index 1566f6e..8f251a2 100644
--- a/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/util/Utils.java
+++ b/app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/util/Utils.java
@@ -1,8 +1,9 @@
package com.ajts.androidmads.sqlite2xlDemo.util;
-import android.support.design.widget.Snackbar;
import android.view.View;
+import com.google.android.material.snackbar.Snackbar;
+
/**
* Created by Mushtaq on 14-04-2017.
*/
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 29e7345..9da8508 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
-
+ app:popupTheme="@style/AppTheme.AppBarOverlay" />
-
+
-
+
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index dbbdd40..0e2278d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -4,6 +4,6 @@
- false
- true
- true
- - @android:color/transparent
+
diff --git a/build.gradle b/build.gradle
index c7033d4..d27e82f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/'
name 'Google'
}
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 869e8ce..40edf30 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1024m
# When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d2e68c..8426d48 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 29 21:54:24 IST 2018
+#Tue Jan 01 10:41:53 IST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 81a04ce..6dae780 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -6,12 +6,10 @@ group = 'com.ajts.androidmads.SQLite2Excel'
version = '1.0.4'
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.3'
-
+ compileSdkVersion 28
defaultConfig {
minSdkVersion 15
- targetSdkVersion 26
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
}
@@ -24,7 +22,8 @@ android {
}
dependencies {
- compile 'org.apache.poi:poi:3.16'
+ //noinspection GradleDependency
+ implementation 'org.apache.poi:poi:3.16'
}
def siteUrl = 'https://github.com/androidmads/SQLite2XL' // Homepage URL of the library