Skip to content
This repository was archived by the owner on Jul 11, 2025. It is now read-only.

enable android.useAndroidX #115

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

enable android.useAndroidX #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ViewPager2/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
applicationId "com.example.androidx.viewpager2"
minSdkVersion 14
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -33,9 +33,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.fragment:fragment-ktx:1.2.0-beta02'
implementation 'com.google.android.material:material:1.2.0-alpha01'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50'
implementation 'androidx.fragment:fragment-ktx:1.2.2'
implementation 'com.google.android.material:material:1.2.0-alpha04'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61'

// Testing dependencies
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions ViewPager2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50'
classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61'
}
}

Expand Down
1 change: 1 addition & 0 deletions ViewPager2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ org.gradle.jvmargs=-Xmx1536m
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.useAndroidX=true
4 changes: 2 additions & 2 deletions ViewPager2/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jul 10 09:03:49 CST 2019
#Thu Feb 20 12:15:53 EET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip