From 35addca8180d7c1d5c762c8fbf65434e34100741 Mon Sep 17 00:00:00 2001 From: tiromansev Date: Thu, 20 May 2021 09:41:27 +0300 Subject: [PATCH] dependencies update --- build.gradle | 2 +- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 4 ++-- sample/build.gradle | 14 ++++++-------- .../github/clans/fab/sample/HomeFragment.java | 5 ++--- .../github/clans/fab/sample/MainActivity.java | 16 ++++++++-------- .../github/clans/fab/sample/MenusFragment.java | 6 +++--- .../clans/fab/sample/ProgressFragment.java | 8 ++++---- sample/src/main/res/layout/main_activity.xml | 6 +++--- sample/src/main/res/layout/progress_fragment.xml | 2 +- sample/src/main/res/layout/toolbar.xml | 2 +- 12 files changed, 36 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index a9b5ba4..d21475a 100755 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + 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 diff --git a/gradle.properties b/gradle.properties index 2e6a6c0..a4af11a 100755 --- a/gradle.properties +++ b/gradle.properties @@ -30,4 +30,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=clans -POM_DEVELOPER_NAME=Dmytro Tarianyk \ No newline at end of file +POM_DEVELOPER_NAME=Dmytro Tarianyk +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 f9d7014..80ea1ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 01 14:35:46 MSK 2017 +#Tue Feb 16 08:40:47 MSK 2021 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-6.7.1-bin.zip diff --git a/library/build.gradle b/library/build.gradle index 19480f3..6283cb2 100755 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 + compileSdkVersion 30 defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 30 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION_NAME } diff --git a/sample/build.gradle b/sample/build.gradle index 07e9567..dc0b05e 100755 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 30 defaultConfig { applicationId "com.github.fab.sample" minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 30 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION_NAME } @@ -24,11 +24,9 @@ android { } } -def support = '26.1.0' - dependencies { - compile "com.android.support:appcompat-v7:$support" - compile "com.android.support:recyclerview-v7:$support" - compile "com.android.support:design:$support" - compile project(':library') + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.recyclerview:recyclerview:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + implementation project(':library') } diff --git a/sample/src/main/java/com/github/clans/fab/sample/HomeFragment.java b/sample/src/main/java/com/github/clans/fab/sample/HomeFragment.java index fa4f312..3d93872 100644 --- a/sample/src/main/java/com/github/clans/fab/sample/HomeFragment.java +++ b/sample/src/main/java/com/github/clans/fab/sample/HomeFragment.java @@ -1,10 +1,9 @@ package com.github.clans.fab.sample; -import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/github/clans/fab/sample/MainActivity.java b/sample/src/main/java/com/github/clans/fab/sample/MainActivity.java index ff27ca3..9d10f09 100755 --- a/sample/src/main/java/com/github/clans/fab/sample/MainActivity.java +++ b/sample/src/main/java/com/github/clans/fab/sample/MainActivity.java @@ -1,14 +1,14 @@ package com.github.clans.fab.sample; import android.os.Bundle; -import android.support.design.widget.NavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import com.github.fab.sample.R; diff --git a/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java b/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java index af0a82c..b7354ff 100644 --- a/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java +++ b/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java @@ -6,9 +6,9 @@ import android.animation.ObjectAnimator; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; diff --git a/sample/src/main/java/com/github/clans/fab/sample/ProgressFragment.java b/sample/src/main/java/com/github/clans/fab/sample/ProgressFragment.java index 830646f..c40f4b8 100644 --- a/sample/src/main/java/com/github/clans/fab/sample/ProgressFragment.java +++ b/sample/src/main/java/com/github/clans/fab/sample/ProgressFragment.java @@ -2,10 +2,10 @@ import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/sample/src/main/res/layout/main_activity.xml b/sample/src/main/res/layout/main_activity.xml index e48b4e1..928ece0 100755 --- a/sample/src/main/res/layout/main_activity.xml +++ b/sample/src/main/res/layout/main_activity.xml @@ -1,4 +1,4 @@ - - - + diff --git a/sample/src/main/res/layout/progress_fragment.xml b/sample/src/main/res/layout/progress_fragment.xml index 8407a59..1b7d37e 100644 --- a/sample/src/main/res/layout/progress_fragment.xml +++ b/sample/src/main/res/layout/progress_fragment.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - -