Skip to content

Commit 41e4f42

Browse files
mdhanif-simformsolutionsmdhanif-simformsolutions
committed
Migrate to AndroidX
1 parent 7a65fc1 commit 41e4f42

File tree

26 files changed

+468
-327
lines changed

26 files changed

+468
-327
lines changed

‎.idea/compiler.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/build.gradle‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
apply plugin: 'com.android.application'
2-
32
apply plugin: 'kotlin-android'
4-
53
apply plugin: 'kotlin-android-extensions'
64

75
android {
8-
compileSdkVersion 27
6+
compileSdkVersion 30
97
defaultConfig {
108
applicationId "com.elconfidencial.bubbleshowcase"
11-
minSdkVersion 16
12-
targetSdkVersion 27
9+
minSdkVersion 21
10+
targetSdkVersion 30
1311
versionCode 1
1412
versionName "1.0"
15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1614
}
1715
buildTypes {
1816
release {
@@ -25,11 +23,12 @@ android {
2523
dependencies {
2624
implementation fileTree(dir: 'libs', include: ['*.jar'])
2725
implementation project(':bubbleshowcase')
28-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29-
implementation 'com.android.support:design:27.1.1'
30-
implementation 'com.android.support:appcompat-v7:27.1.1'
31-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
32-
testImplementation 'junit:junit:4.12'
33-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
34-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
26+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
27+
implementation 'androidx.core:core-ktx:1.3.2'
28+
implementation 'com.google.android.material:material:1.2.1'
29+
implementation 'androidx.appcompat:appcompat:1.2.0'
30+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
31+
testImplementation 'junit:junit:4.13'
32+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
33+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3534
}

‎app/src/androidTest/java/com/elconfidencial/bubbleshowcase/ExampleInstrumentedTest.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.elconfidencial.bubbleshowcase
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
5-
3+
import androidx.test.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*

‎app/src/main/java/com/elconfidencial/bubbleshowcase/MainActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.elconfidencial.bubbleshowcase
22

3-
import android.support.v7.app.AppCompatActivity
3+
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
5-
import android.support.v4.content.ContextCompat
6-
import android.support.v7.view.menu.ActionMenuItemView
5+
import androidx.core.content.ContextCompat
6+
import androidx.appcompat.view.menu.ActionMenuItemView
77
import android.view.Menu
88
import android.view.MenuItem
99
import android.widget.Toast

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -85,4 +85,4 @@
8585
app:layout_constraintStart_toStartOf="parent"
8686
app:layout_constraintTop_toBottomOf="@+id/buttonEventListener" />
8787

88-
</android.support.constraint.ConstraintLayout>
88+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)