Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

Commit e43b3e5

Browse files
committed
DrawableAnimations: Update dependencies
Change-Id: I4ddb0ca23b86fc0db0355ed50c46eb6510f2e259
1 parent a441a1d commit e43b3e5

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

DrawableAnimations/app/build.gradle

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ apply plugin: 'com.android.application'
1818
apply plugin: 'kotlin-android'
1919

2020
android {
21-
compileSdkVersion 29
22-
buildToolsVersion '29.0.3'
23-
21+
compileSdkVersion 31
2422
defaultConfig {
2523
applicationId 'com.example.android.drawableanimations'
2624
minSdkVersion 14
27-
targetSdkVersion 29
25+
targetSdkVersion 31
2826
versionCode 1
2927
versionName '1.0'
3028
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -55,20 +53,20 @@ android {
5553
}
5654

5755
dependencies {
58-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
56+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5957

60-
implementation 'androidx.activity:activity-ktx:1.1.0'
61-
implementation 'androidx.fragment:fragment-ktx:1.2.4'
62-
implementation 'androidx.appcompat:appcompat:1.1.0'
63-
implementation 'androidx.core:core-ktx:1.2.0'
64-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
65-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
66-
implementation "androidx.vectordrawable:vectordrawable-seekable:1.0.0-alpha01"
58+
implementation 'androidx.activity:activity-ktx:1.3.1'
59+
implementation 'androidx.fragment:fragment-ktx:1.3.6'
60+
implementation 'androidx.appcompat:appcompat:1.3.1'
61+
implementation 'androidx.core:core-ktx:1.6.0'
62+
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
63+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
64+
implementation "androidx.vectordrawable:vectordrawable-seekable:1.0.0-alpha02"
6765

68-
testImplementation 'junit:junit:4.12'
69-
androidTestImplementation 'com.google.truth:truth:1.0'
70-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
71-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
72-
debugImplementation 'androidx.fragment:fragment-testing:1.2.4'
73-
androidTestImplementation 'androidx.core:core-animation-testing:1.0.0-alpha01'
66+
testImplementation 'junit:junit:4.13.2'
67+
androidTestImplementation 'com.google.truth:truth:1.1.3'
68+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
69+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
70+
debugImplementation 'androidx.fragment:fragment-testing:1.4.0-alpha10'
71+
androidTestImplementation 'androidx.core:core-animation-testing:1.0.0-alpha02'
7472
}

DrawableAnimations/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
android:supportsRtl="true"
2727
android:theme="@style/AppTheme">
2828

29-
<activity android:name=".MainActivity">
29+
<activity
30+
android:name=".MainActivity"
31+
android:exported="true">
3032
<intent-filter>
3133
<action android:name="android.intent.action.MAIN" />
3234
<category android:name="android.intent.category.LAUNCHER" />

DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/DemoListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal class DemoListAdapter(
3131
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DemoViewHolder {
3232
return DemoViewHolder(LayoutInflater.from(parent.context), parent).apply {
3333
itemView.setOnClickListener {
34-
demoClicked(getItem(adapterPosition))
34+
demoClicked(getItem(bindingAdapterPosition))
3535
}
3636
}
3737
}

DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/HomeFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class HomeFragment : Fragment(R.layout.home_fragment) {
4848
))
4949
}
5050

51-
override fun onActivityCreated(savedInstanceState: Bundle?) {
52-
super.onActivityCreated(savedInstanceState)
51+
override fun onResume() {
52+
super.onResume()
5353
activity?.setTitle(R.string.app_name)
5454
}
5555
}

DrawableAnimations/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.3.72'
18+
ext.kotlin_version = '1.5.31'
1919
repositories {
2020
google()
2121
mavenCentral()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:4.2.2'
24+
classpath 'com.android.tools.build:gradle:7.0.3'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2626
}
2727
}

DrawableAnimations/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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-6.7.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

0 commit comments

Comments
 (0)