diff --git a/app/app.iml b/app/app.iml index 880b68b..4d41032 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,6 +4,8 @@ @@ -18,21 +20,23 @@ - - + + + - - + + - - - + + - - - - - - + + + + - - - - + + + @@ -111,61 +122,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c76e4c3..01c2047 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,14 +5,14 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 + compileSdkVersion 29 defaultConfig { applicationId "net.khirr.android.privacypolicy.example" minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -25,8 +25,8 @@ android { dependencies { implementation project(':library') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' - implementation 'com.android.support:design:26.1.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.1.0' } diff --git a/app/src/main/java/net/khirr/android/privacypolicy/example/MainActivity.java b/app/src/main/java/net/khirr/android/privacypolicy/example/MainActivity.java index 94f9357..2fcccd7 100644 --- a/app/src/main/java/net/khirr/android/privacypolicy/example/MainActivity.java +++ b/app/src/main/java/net/khirr/android/privacypolicy/example/MainActivity.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import net.khirr.android.privacypolicy.PrivacyPolicyDialog; diff --git a/app/src/main/java/net/khirr/android/privacypolicy/example/SecondActivity.java b/app/src/main/java/net/khirr/android/privacypolicy/example/SecondActivity.java index d958ad1..598e2a1 100644 --- a/app/src/main/java/net/khirr/android/privacypolicy/example/SecondActivity.java +++ b/app/src/main/java/net/khirr/android/privacypolicy/example/SecondActivity.java @@ -1,10 +1,10 @@ package net.khirr.android.privacypolicy.example; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; public class SecondActivity extends AppCompatActivity { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 84f1951..4fc2444 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml index 0546a77..c3ff60d 100644 --- a/app/src/main/res/layout/activity_second.xml +++ b/app/src/main/res/layout/activity_second.xml @@ -1,28 +1,28 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 98123f7..b1bd528 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.40' - ext.kotlin_version = '1.2.31' + ext.kotlin_version = '1.3.71' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 743d692..8de5058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # 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=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb4b3d0..acf822f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 26 15:36:48 CEST 2018 +#Fri Apr 10 13:44:03 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index e5125c3..ae23003 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -11,7 +11,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -29,10 +29,10 @@ def supportVersion = '26.1.0' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:appcompat-v7:$supportVersion" + implementation 'androidx.appcompat:appcompat:1.1.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:recyclerview-v7:$supportVersion" - implementation "com.android.support:appcompat-v7:$supportVersion" + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.appcompat:appcompat:1.1.0' } repositories { mavenCentral() diff --git a/library/library.iml b/library/library.iml index 6acc618..1d00530 100644 --- a/library/library.iml +++ b/library/library.iml @@ -4,6 +4,8 @@ @@ -18,22 +20,24 @@ - - + + + - - + + - - - + + - - - - - - + + + + - - - - + + + @@ -77,13 +88,6 @@ - - - - - - - @@ -91,6 +95,13 @@ + + + + + + + @@ -98,13 +109,6 @@ - - - - - - - @@ -112,46 +116,46 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPoliciesAdapter.kt b/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPoliciesAdapter.kt index 927ed4d..a4a554d 100644 --- a/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPoliciesAdapter.kt +++ b/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPoliciesAdapter.kt @@ -1,6 +1,6 @@ package net.khirr.android.privacypolicy -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPolicyDialog.kt b/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPolicyDialog.kt index 5804fb4..c33338b 100644 --- a/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPolicyDialog.kt +++ b/library/src/main/java/net/khirr/android/privacypolicy/PrivacyPolicyDialog.kt @@ -8,8 +8,8 @@ import android.graphics.drawable.ColorDrawable import android.graphics.drawable.GradientDrawable import android.graphics.drawable.RippleDrawable import android.os.Build -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.text.Html import android.text.Spanned import android.text.method.LinkMovementMethod @@ -23,9 +23,6 @@ import android.graphics.drawable.Drawable import java.util.* import android.content.res.ColorStateList - - - class PrivacyPolicyDialog(private val context: AppCompatActivity, private val termsOfServiceUrl: String, private val privacyPolicyUrl: String) { diff --git a/library/src/main/res/layout/net_khirr_dialog_privacy_policies.xml b/library/src/main/res/layout/net_khirr_dialog_privacy_policies.xml index 8fa7cc8..d1b4b33 100644 --- a/library/src/main/res/layout/net_khirr_dialog_privacy_policies.xml +++ b/library/src/main/res/layout/net_khirr_dialog_privacy_policies.xml @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:id="@+id/termsOfServiceTextView"/> --> -