diff --git a/build.gradle b/build.gradle index 3bce0eb..4de7029 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0-rc1' + classpath 'com.android.tools.build:gradle:4.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,6 +23,7 @@ allprojects { repositories { mavenCentral() + google() } } diff --git a/gradle.properties b/gradle.properties index 5a3ee28..34cb91b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=filippudak -POM_DEVELOPER_NAME=Filip Pudak \ No newline at end of file +POM_DEVELOPER_NAME=Filip Pudak +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb2f9d0..ae7ff36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index d81cc8f..f8cdbb9 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 - buildToolsVersion "21.1.1" + compileSdkVersion 30 defaultConfig { minSdkVersion 4 - targetSdkVersion 21 + targetSdkVersion 30 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION_NAME } @@ -14,7 +13,7 @@ android { } dependencies { - compile 'com.android.support:support-v4:21.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' } apply from: '../maven_push.gradle' \ No newline at end of file diff --git a/library/src/main/java/com/filippudak/ProgressPieView/ProgressPieView.java b/library/src/main/java/com/filippudak/ProgressPieView/ProgressPieView.java index 55f7e31..35e0c98 100644 --- a/library/src/main/java/com/filippudak/ProgressPieView/ProgressPieView.java +++ b/library/src/main/java/com/filippudak/ProgressPieView/ProgressPieView.java @@ -15,9 +15,10 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; -import android.support.v4.util.LruCache; import android.view.View; +import androidx.collection.LruCache; + public class ProgressPieView extends View { public interface OnProgressListener { diff --git a/sample/build.gradle b/sample/build.gradle index 2a5698e..91dcc4e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "21.1.1" + compileSdkVersion 30 defaultConfig { applicationId "com.filippudak.ProgressPieView.sample" - minSdkVersion 8 - targetSdkVersion 21 + minSdkVersion 21 + targetSdkVersion 30 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION_NAME } @@ -15,6 +14,6 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:21.0.2' - compile project(':library') + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation project(':library') } diff --git a/sample/src/main/java/com/filippudak/ProgressPieView/sample/MainActivity.java b/sample/src/main/java/com/filippudak/ProgressPieView/sample/MainActivity.java index 520bca1..846456e 100644 --- a/sample/src/main/java/com/filippudak/ProgressPieView/sample/MainActivity.java +++ b/sample/src/main/java/com/filippudak/ProgressPieView/sample/MainActivity.java @@ -1,7 +1,6 @@ package com.filippudak.ProgressPieView.sample; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; @@ -9,9 +8,11 @@ import android.widget.LinearLayout; import android.widget.SeekBar; +import androidx.appcompat.app.AppCompatActivity; + import com.filippudak.ProgressPieView.ProgressPieView; -public class MainActivity extends ActionBarActivity { +public class MainActivity extends AppCompatActivity { private static final int SIZE = 96; private static final int MARGIN = 8;