Skip to content

Commit 2980d34

Browse files
committed
feat: migrate to androidx
Signed-off-by: BirjuVachhani <brvachhani@gmail.com>
1 parent 7bdf89c commit 2980d34

File tree

12 files changed

+33
-37
lines changed

12 files changed

+33
-37
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
dependencies {
2525
implementation fileTree(include: ['*.jar'], dir: 'libs')
2626
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
27-
implementation 'com.android.support:appcompat-v7:28.0.0'
28-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
27+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
28+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
2929
implementation project(':bext')
3030
}

app/src/main/java/com/birjuvachhani/baseextensions/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.birjuvachhani.baseextensions
1818

1919
import android.os.Bundle
20-
import android.support.v7.app.AppCompatActivity
2120
import android.view.View
21+
import androidx.appcompat.app.AppCompatActivity
2222
import com.bext.alertDialog
2323
import com.bext.toast
2424

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<android.support.constraint.ConstraintLayout
18+
<androidx.constraintlayout.widget.ConstraintLayout
1919
xmlns:android="http://schemas.android.com/apk/res/android"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
@@ -28,4 +28,4 @@
2828
android:layout_width="wrap_content"
2929
android:layout_height="wrap_content"/>
3030

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

bext/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'com.github.dcendents.android-maven'
1+
apply plugin: "com.android.library"
2+
apply plugin: "kotlin-android"
3+
apply plugin: "com.github.dcendents.android-maven"
44

5-
group='com.github.BirjuVachhani'
5+
group="com.github.BirjuVachhani"
66

77
android {
88
compileSdkVersion 28
@@ -12,20 +12,20 @@ android {
1212
versionCode 1
1313
versionName "1.0"
1414
}
15-
1615
buildTypes {
1716
release {
1817
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
2019
}
2120
}
2221
}
2322

2423
dependencies {
25-
api fileTree(dir: 'libs', include: ['*.jar'])
26-
api 'com.android.support:appcompat-v7:28.0.0'
27-
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0"
24+
api fileTree(dir: "libs", include: ["*.jar"])
25+
api "androidx.appcompat:appcompat:1.0.2"
26+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.0"
2827
}
28+
2929
repositories {
3030
mavenCentral()
3131
}

bext/src/main/java/com/bext/ActivityExtensions.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import android.app.Activity
2020
import android.content.Context
2121
import android.content.Intent
2222
import android.os.Handler
23-
import android.support.v4.app.FragmentTransaction
24-
import android.support.v7.app.AppCompatActivity
2523
import android.view.View
2624
import android.view.inputmethod.InputMethodManager
25+
import androidx.appcompat.app.AppCompatActivity
26+
import androidx.fragment.app.FragmentTransaction
2727

2828
/**
2929
* Created by Birju Vachhani on 13/11/18.
@@ -63,7 +63,7 @@ inline fun <reified T : Activity> Activity.navigateTo() =
6363
* which provides access to the transaction instance which will be
6464
* used to process [FragmentTransaction]
6565
* */
66-
fun AppCompatActivity.transact(func: FragmentTransaction.() -> Unit) =
66+
fun AppCompatActivity.transact(func: androidx.fragment.app.FragmentTransaction.() -> Unit) =
6767
this.supportFragmentManager.beginTransaction().apply {
6868
func()
6969
}.commit()

bext/src/main/java/com/bext/AlertDialogExtensions.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package com.bext
1818

1919
import android.app.Activity
2020
import android.content.Context
21-
import android.support.annotation.StringRes
22-
import android.support.v4.app.Fragment
23-
import android.support.v7.app.AlertDialog
21+
import androidx.annotation.StringRes
22+
import androidx.appcompat.app.AlertDialog
23+
import androidx.fragment.app.Fragment
2424

2525
/**
2626
* Created by Birju Vachhani on 01/11/18.

bext/src/main/java/com/bext/LifeCycleExtensions.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package com.bext
1818

19-
import android.arch.lifecycle.LifecycleOwner
20-
import android.arch.lifecycle.LiveData
21-
import android.arch.lifecycle.MutableLiveData
22-
import android.arch.lifecycle.Observer
19+
import androidx.lifecycle.LifecycleOwner
20+
import androidx.lifecycle.LiveData
21+
import androidx.lifecycle.MutableLiveData
22+
import androidx.lifecycle.Observer
2323

2424
/**
2525
* Created by Birju Vachhani on 16-12-2018.

bext/src/main/java/com/bext/ToastExtensions.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package com.bext
1818

1919
import android.content.Context
20-
import android.support.annotation.StringRes
21-
import android.support.v4.app.Fragment
22-
import android.support.v7.app.AlertDialog
2320
import android.widget.Toast
21+
import androidx.annotation.StringRes
22+
import androidx.appcompat.app.AlertDialog
23+
import androidx.fragment.app.Fragment
2424

2525
/**
2626
* Created by Birju Vachhani on 01/11/18.

bext/src/main/java/com/bext/ViewExtensions.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.bext
1818

1919
import android.view.View
2020

21-
2221
/**
2322
* Created by Birju Vachhani on 03-11-2018.
2423
*/

build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
4-
ext.kotlin_version = '1.3.0'
2+
ext.kotlin_version = "1.3.0"
53
repositories {
64
google()
75
jcenter()
86
}
97
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath "com.android.tools.build:gradle:3.2.1"
119
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // For jit-pack
13-
14-
// NOTE: Do not place your application dependencies here; they belong
15-
// in the individual module build.gradle files
10+
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1" // For jit-pack
1611
}
1712
}
1813

0 commit comments

Comments
 (0)