Skip to content

Commit 4587bac

Browse files
committed
Use AndroidX in the sample app
1 parent f01e70d commit 4587bac

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Usage
1919
```groovy
2020
dependencies {
2121
/* ... */
22-
annotationProcessor 'org.jraf:prefs-compiler:1.3.0' // or kapt if you use Kotlin
23-
implementation 'org.jraf:prefs:1.3.0'
22+
annotationProcessor 'org.jraf:prefs-compiler:1.4.0' // or kapt if you use Kotlin
23+
implementation 'org.jraf:prefs:1.4.0'
2424
}
2525
```
2626

gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@
1818
org.gradle.parallel=true
1919
# Enable build cache
2020
org.gradle.caching=true
21+
# Use AndroidX
22+
android.useAndroidX=true
23+
android.enableJetifier=true

sample/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ android {
2727

2828
dependencies {
2929
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10'
30-
implementation "com.android.support:appcompat-v7:28.0.0"
31-
implementation 'com.android.support:support-annotations:28.0.0'
32-
implementation 'android.arch.lifecycle:livedata:1.1.1'
30+
implementation 'androidx.appcompat:appcompat:1.0.0'
31+
implementation 'androidx.annotation:annotation:1.0.0'
32+
implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
3333

3434
kapt project(':prefs-compiler')
3535
implementation project(':prefs')

sample/src/main/kotlin/org/jraf/android/prefs/sample/app/MainActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
*/
2424
package org.jraf.android.prefs.sample.app
2525

26-
import android.arch.lifecycle.Observer
2726
import android.os.Bundle
28-
import android.support.v7.app.AppCompatActivity
2927
import android.util.Log
28+
import androidx.appcompat.app.AppCompatActivity
29+
import androidx.lifecycle.Observer
3030
import org.jraf.android.prefs.sample.R
3131
import org.jraf.android.prefs.sample.prefs.MainPrefs
3232
import org.jraf.android.prefs.sample.prefs.SettingsPrefs

sample/src/main/kotlin/org/jraf/android/prefs/sample/prefs/Main.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import org.jraf.android.prefs.Prefs
3232
*/
3333
@Prefs(
3434
generateGetLiveData = true,
35-
useAndroidX = false
35+
useAndroidX = true
3636
)
3737
class Main {
3838

sample/src/main/kotlin/org/jraf/android/prefs/sample/prefs/Settings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import org.jraf.android.prefs.Prefs
3434
@Prefs(
3535
fileName = "settings",
3636
fileMode = Context.MODE_PRIVATE,
37-
useAndroidX = false
37+
useAndroidX = true
3838
)
3939
class Settings {
4040
@DefaultInt(-0x44ff23)

0 commit comments

Comments
 (0)