Skip to content

Commit aae5617

Browse files
Merge pull request #98 from Omega-R/develop
AndroidX
2 parents 14d93ac + 3b0ec28 commit aae5617

32 files changed

Lines changed: 61 additions & 60 deletions

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44

55
ext.kotlin_version = '1.3.11'
6-
ext.supportVersion = '28.0.0'
6+
ext.androidX = '1.0.2'
77
ext.sdkVersion = 28
88
ext.javapoet = '1.9.0'
99

core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
manifestPlaceholders = [omegaSuffixAuthority: suffixAuthority]
1919
buildConfigField "String", "SUFFIX_AUTHORITY", "\""+suffixAuthority+"\""
2020

21-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
21+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2222

2323

2424
}
@@ -35,7 +35,7 @@ android {
3535
dependencies {
3636
implementation fileTree(dir: 'libs', include: ['*.jar'])
3737
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
38-
compileOnly "com.android.support:appcompat-v7:$supportVersion"
38+
compileOnly "androidx.appcompat:appcompat:$androidX"
3939
}
4040

4141
repositories {

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ActivityIntentBuilder<T : Activity>(
3636
return FragmentIntentHandler(fragment, createIntent())
3737
}
3838

39-
override fun createIntentHandler(fragment: android.support.v4.app.Fragment): SupportFragmentIntentHandler {
39+
override fun createIntentHandler(fragment: androidx.fragment.app.Fragment): SupportFragmentIntentHandler {
4040
return SupportFragmentIntentHandler(fragment, createIntent())
4141
}
4242

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseActivityBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ abstract class BaseActivityBuilder(private val context: Context): IntentHandler
3333
return FragmentIntentHandler(fragment, createIntent())
3434
}
3535

36-
override fun createIntentHandler(fragment: android.support.v4.app.Fragment): SupportFragmentIntentHandler {
36+
override fun createIntentHandler(fragment: androidx.fragment.app.Fragment): SupportFragmentIntentHandler {
3737
return SupportFragmentIntentHandler(fragment, createIntent())
3838
}
3939

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/CalendarIntentBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import android.content.Context
1515
import android.content.Intent
1616
import android.provider.CalendarContract
1717
import android.provider.CalendarContract.*
18-
import android.support.annotation.StringRes
18+
import androidx.annotation.StringRes
1919
import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes
2020
import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes.*
2121
import com.omega_r.libs.omegaintentbuilder.types.CalendarAvailabilityTypes

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/PlayStoreBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.omega_r.libs.omegaintentbuilder.builders
33
import android.content.Context
44
import android.content.Intent
55
import android.net.Uri
6-
import android.support.annotation.StringRes
6+
import androidx.annotation.StringRes
77

88
class PlayStoreBuilder(private val context: Context): BaseActivityBuilder(context) {
99

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SettingsIntentBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import android.content.Intent
1616
import android.net.Uri
1717
import android.os.Build
1818
import android.provider.Settings
19-
import android.support.annotation.RequiresApi
19+
import androidx.annotation.RequiresApi
2020

2121
/**
2222
* SettingsIntentBuilder is a helper for constructing settings intent

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SmsIntentBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import android.content.Intent
1616
import android.net.Uri
1717
import android.os.Build
1818
import android.provider.Telephony
19-
import android.support.annotation.StringRes
19+
import androidx.annotation.StringRes
2020
import java.util.TreeSet
2121

2222
/**

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SpeechToTextBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import android.content.Context
1414
import android.content.Intent
1515
import android.os.Build
1616
import android.speech.RecognizerIntent
17-
import android.support.annotation.RequiresApi
18-
import android.support.annotation.StringRes
17+
import androidx.annotation.RequiresApi
18+
import androidx.annotation.StringRes
1919
import com.omega_r.libs.omegaintentbuilder.types.LanguageModelTypes
2020
import java.util.*
2121

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/pick/BasePickBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package com.omega_r.libs.omegaintentbuilder.builders.pick
1313
import android.content.Context
1414
import android.content.Intent
1515
import android.os.Build
16-
import android.support.annotation.RequiresApi
16+
import androidx.annotation.RequiresApi
1717
import com.omega_r.libs.omegaintentbuilder.builders.BaseActivityBuilder
1818
import com.omega_r.libs.omegaintentbuilder.types.MimeTypes
1919

0 commit comments

Comments
 (0)