diff --git a/app/build.gradle b/app/build.gradle index dd56a19..1007daf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,9 +25,9 @@ dependencies { } implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':customalert') - implementation 'com.github.searchy2:CustomButton:1.9.0' + implementation 'com.github.searchy2:CustomButton:1.9.1' - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5729446..68031ca 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } diff --git a/customalert/build.gradle b/customalert/build.gradle index c68304b..b2fba8f 100644 --- a/customalert/build.gradle +++ b/customalert/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' group='com.github.searchy2' -version = '2.6.0' +version = '2.6.1' android { compileSdkVersion 28 @@ -25,7 +25,7 @@ dependencies { maven { url "https://maven.google.com" } } implementation fileTree(include: ['*.jar'], dir: 'libs') - api 'com.google.android.material:material:1.0.0' + api 'com.google.android.material:material:1.1.0' api 'com.eightbitlab:blurview:1.5.0' } diff --git a/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java b/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java index 3c22482..98abd94 100644 --- a/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java +++ b/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java @@ -10,13 +10,6 @@ import android.os.Handler; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.fragment.app.DialogFragment; -import androidx.core.content.ContextCompat; -import androidx.appcompat.app.AppCompatActivity; import android.text.method.ScrollingMovementMethod; import android.util.DisplayMetrics; import android.util.Log; @@ -34,9 +27,17 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ListView; -import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.DialogFragment; + +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import java.util.ArrayList; import java.util.List; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b5eac25..19a8bd5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 17 19:25:00 CDT 2019 +#Sat Jul 04 09:48:13 CDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip