Skip to content

Commit 6ac1f33

Browse files
committed
up-to-date: update build context to: compileSdkVersion 29, targetSdkVersion 29, androidx, gradlew 6.0
1 parent cd68ecc commit 6ac1f33

File tree

10 files changed

+25
-28
lines changed

10 files changed

+25
-28
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.5.3'
1010
}
1111
}
1212

gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.enableJetifier=true
20+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip

library/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion "27.0.1"
4+
compileSdkVersion 29
65

76
defaultConfig {
87
minSdkVersion 16
9-
targetSdkVersion 27
8+
targetSdkVersion 29
109
}
1110
buildTypes {
1211
release {
@@ -19,7 +18,7 @@ android {
1918
dependencies {
2019
implementation fileTree(dir: 'libs', include: ['*.jar'])
2120
testImplementation 'junit:junit:4.12'
22-
implementation 'com.android.support:appcompat-v7:27.0.2'
21+
implementation 'androidx.appcompat:appcompat:1.1.0'
2322
}
2423

2524
apply from: 'publish.gradle'

library/src/main/java/link/fls/swipestack/SwipeHelper.java

-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
package link.fls.swipestack;
1818

1919
import android.animation.Animator;
20-
import android.support.annotation.Nullable;
2120
import android.util.Log;
2221
import android.view.MotionEvent;
2322
import android.view.View;
2423
import android.view.ViewConfiguration;
2524
import android.view.animation.OvershootInterpolator;
2625

27-
import java.util.Calendar;
28-
2926
import link.fls.swipestack.util.AnimationUtils;
3027

3128
public class SwipeHelper implements View.OnTouchListener {

library/src/main/java/link/fls/swipestack/SwipeStack.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import android.os.Build;
2323
import android.os.Bundle;
2424
import android.os.Parcelable;
25-
import android.support.annotation.Nullable;
25+
import androidx.annotation.Nullable;
2626
import android.util.AttributeSet;
2727
import android.view.View;
2828
import android.view.ViewGroup;

sample/build.gradle

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion "27.0.1"
4+
compileSdkVersion 29
65

76
defaultConfig {
87
applicationId "link.fls.swipestacksample"
98
minSdkVersion 16
10-
targetSdkVersion 27
9+
targetSdkVersion 29
1110
versionCode 1
1211
versionName "1.0"
1312
}
@@ -20,10 +19,10 @@ android {
2019
}
2120

2221
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
testCompile 'junit:junit:4.12'
25-
compile project(':library')
26-
compile 'com.android.support:appcompat-v7:27.0.2'
27-
compile 'com.android.support:cardview-v7:27.0.2'
28-
compile 'com.android.support:design:27.0.2'
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
testImplementation 'junit:junit:4.12'
24+
implementation project(':library')
25+
implementation 'androidx.appcompat:appcompat:1.1.0'
26+
implementation 'androidx.cardview:cardview:1.0.0'
27+
implementation 'com.google.android.material:material:1.0.0'
2928
}

sample/src/main/java/link/fls/swipestacksample/MainActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import android.content.Intent;
2020
import android.net.Uri;
2121
import android.os.Bundle;
22-
import android.support.design.widget.FloatingActionButton;
23-
import android.support.design.widget.Snackbar;
24-
import android.support.v7.app.AppCompatActivity;
22+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
23+
import com.google.android.material.snackbar.Snackbar;
24+
import androidx.appcompat.app.AppCompatActivity;
2525
import android.view.Menu;
2626
import android.view.MenuInflater;
2727
import android.view.MenuItem;

sample/src/main/res/layout/activity_main.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
app:stack_rotation="10"
3636
app:stack_size="3"/>
3737

38-
<android.support.design.widget.CoordinatorLayout
38+
<androidx.coordinatorlayout.widget.CoordinatorLayout
3939
android:layout_width="match_parent"
4040
android:layout_height="match_parent">
4141

42-
<android.support.design.widget.FloatingActionButton
42+
<com.google.android.material.floatingactionbutton.FloatingActionButton
4343
android:id="@+id/fabAdd"
4444
android:layout_width="wrap_content"
4545
android:layout_height="wrap_content"
@@ -48,6 +48,6 @@
4848
android:src="@drawable/ic_content_add"
4949
app:fabSize="normal"/>
5050

51-
</android.support.design.widget.CoordinatorLayout>
51+
</androidx.coordinatorlayout.widget.CoordinatorLayout>
5252

5353
</RelativeLayout>

sample/src/main/res/layout/card.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.CardView
2+
<androidx.cardview.widget.CardView
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:card_view="http://schemas.android.com/apk/res-auto"
55
android:layout_height="match_parent"
@@ -15,4 +15,4 @@
1515
android:textSize="44sp"
1616
android:text="@string/dummy_text"/>
1717

18-
</android.support.v7.widget.CardView>
18+
</androidx.cardview.widget.CardView>

0 commit comments

Comments
 (0)