diff --git a/build.gradle b/build.gradle index a6d2953..6c98e97 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.kotlin_version = '1.3.11' - ext.supportVersion = '28.0.0' + ext.androidX = '1.0.2' ext.sdkVersion = 28 ext.javapoet = '1.9.0' diff --git a/core/build.gradle b/core/build.gradle index e32c27d..647f3ee 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -18,7 +18,7 @@ android { manifestPlaceholders = [omegaSuffixAuthority: suffixAuthority] buildConfigField "String", "SUFFIX_AUTHORITY", "\""+suffixAuthority+"\"" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -35,7 +35,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - compileOnly "com.android.support:appcompat-v7:$supportVersion" + compileOnly "androidx.appcompat:appcompat:$androidX" } repositories { diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt index 30cae09..47d070b 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt @@ -36,7 +36,7 @@ class ActivityIntentBuilder( return FragmentIntentHandler(fragment, createIntent()) } - override fun createIntentHandler(fragment: android.support.v4.app.Fragment): SupportFragmentIntentHandler { + override fun createIntentHandler(fragment: androidx.fragment.app.Fragment): SupportFragmentIntentHandler { return SupportFragmentIntentHandler(fragment, createIntent()) } diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseActivityBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseActivityBuilder.kt index c0ac93e..daba44b 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseActivityBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseActivityBuilder.kt @@ -33,7 +33,7 @@ abstract class BaseActivityBuilder(private val context: Context): IntentHandler return FragmentIntentHandler(fragment, createIntent()) } - override fun createIntentHandler(fragment: android.support.v4.app.Fragment): SupportFragmentIntentHandler { + override fun createIntentHandler(fragment: androidx.fragment.app.Fragment): SupportFragmentIntentHandler { return SupportFragmentIntentHandler(fragment, createIntent()) } diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/CalendarIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/CalendarIntentBuilder.kt index 64571c5..05d708b 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/CalendarIntentBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/CalendarIntentBuilder.kt @@ -15,7 +15,7 @@ import android.content.Context import android.content.Intent import android.provider.CalendarContract import android.provider.CalendarContract.* -import android.support.annotation.StringRes +import androidx.annotation.StringRes import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes.* import com.omega_r.libs.omegaintentbuilder.types.CalendarAvailabilityTypes diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/PlayStoreBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/PlayStoreBuilder.kt index 7528d6e..e484f1e 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/PlayStoreBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/PlayStoreBuilder.kt @@ -3,7 +3,7 @@ package com.omega_r.libs.omegaintentbuilder.builders import android.content.Context import android.content.Intent import android.net.Uri -import android.support.annotation.StringRes +import androidx.annotation.StringRes class PlayStoreBuilder(private val context: Context): BaseActivityBuilder(context) { diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SettingsIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SettingsIntentBuilder.kt index 719262c..2ba6e3e 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SettingsIntentBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SettingsIntentBuilder.kt @@ -16,7 +16,7 @@ import android.content.Intent import android.net.Uri import android.os.Build import android.provider.Settings -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi /** * SettingsIntentBuilder is a helper for constructing settings intent diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SmsIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SmsIntentBuilder.kt index 3a713d2..3e5b1ec 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SmsIntentBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SmsIntentBuilder.kt @@ -16,7 +16,7 @@ import android.content.Intent import android.net.Uri import android.os.Build import android.provider.Telephony -import android.support.annotation.StringRes +import androidx.annotation.StringRes import java.util.TreeSet /** diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SpeechToTextBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SpeechToTextBuilder.kt index 72136d9..433499c 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SpeechToTextBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/SpeechToTextBuilder.kt @@ -14,8 +14,8 @@ import android.content.Context import android.content.Intent import android.os.Build import android.speech.RecognizerIntent -import android.support.annotation.RequiresApi -import android.support.annotation.StringRes +import androidx.annotation.RequiresApi +import androidx.annotation.StringRes import com.omega_r.libs.omegaintentbuilder.types.LanguageModelTypes import java.util.* diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/pick/BasePickBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/pick/BasePickBuilder.kt index d971880..d6aba99 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/pick/BasePickBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/pick/BasePickBuilder.kt @@ -13,7 +13,7 @@ package com.omega_r.libs.omegaintentbuilder.builders.pick import android.content.Context import android.content.Intent import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import com.omega_r.libs.omegaintentbuilder.builders.BaseActivityBuilder import com.omega_r.libs.omegaintentbuilder.types.MimeTypes diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/share/BaseShareBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/share/BaseShareBuilder.kt index 45dfa75..e1da5cc 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/share/BaseShareBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/share/BaseShareBuilder.kt @@ -14,7 +14,7 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.os.Build -import android.support.annotation.StringRes +import androidx.annotation.StringRes import android.text.Html import com.omega_r.libs.omegaintentbuilder.builders.BaseUriBuilder import com.omega_r.libs.omegaintentbuilder.types.MimeTypes diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/bundle/BundleBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/bundle/BundleBuilder.kt index bab1723..d9232b0 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/bundle/BundleBuilder.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/bundle/BundleBuilder.kt @@ -3,7 +3,7 @@ package com.omega_r.libs.omegaintentbuilder.bundle import android.os.Build import android.os.Bundle import android.os.PersistableBundle -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import java.io.Serializable import java.util.ArrayList diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/downloader/DownloadAsyncTask.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/downloader/DownloadAsyncTask.kt index 4cce571..dc99a3b 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/downloader/DownloadAsyncTask.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/downloader/DownloadAsyncTask.kt @@ -3,7 +3,7 @@ package com.omega_r.libs.omegaintentbuilder.downloader import android.content.Context import android.net.Uri import android.os.AsyncTask -import android.support.annotation.NonNull +import androidx.annotation.NonNull import android.util.Log import com.omega_r.libs.omegaintentbuilder.builders.BaseUriBuilder import com.omega_r.libs.omegaintentbuilder.models.FileInfo diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/ContextIntentHandler.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/ContextIntentHandler.kt index d1a59f4..08271b8 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/ContextIntentHandler.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/ContextIntentHandler.kt @@ -20,7 +20,7 @@ import android.content.Intent.EXTRA_INTENT import android.content.Intent.EXTRA_TITLE import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION import android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION -import android.support.annotation.StringRes +import androidx.annotation.StringRes import android.util.AndroidRuntimeException import android.widget.Toast diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/OmegaHandleResultActivity.java b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/OmegaHandleResultActivity.java index bc80f2f..5d7d1e6 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/OmegaHandleResultActivity.java +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/OmegaHandleResultActivity.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AndroidRuntimeException; import android.util.Log; import android.util.SparseArray; diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/SupportFragmentIntentHandler.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/SupportFragmentIntentHandler.kt index 677af35..48eeb15 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/SupportFragmentIntentHandler.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/handlers/SupportFragmentIntentHandler.kt @@ -13,13 +13,13 @@ package com.omega_r.libs.omegaintentbuilder.handlers import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment /** * FragmentIntentHandler is a helper for start intents * Support startActivityForResult */ -class SupportFragmentIntentHandler(private val fragment: Fragment, private val createdIntent: Intent) : ContextIntentHandler(fragment.context!!, createdIntent) { +class SupportFragmentIntentHandler(private val fragment: androidx.fragment.app.Fragment, private val createdIntent: Intent) : ContextIntentHandler(fragment.context!!, createdIntent) { /** * Launch an activity for which you would like a result when it finished. diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/interfaces/IntentHandler.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/interfaces/IntentHandler.kt index 593a83a..e21eb2a 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/interfaces/IntentHandler.kt +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/interfaces/IntentHandler.kt @@ -32,7 +32,7 @@ interface IntentHandler : IntentBuilder { * Returns FragmentIntentHandler (extends ContextIntentHandler) for control Intent. * Support startActivity, startActivityForResult, start Chooser. */ - fun createIntentHandler(fragment: android.support.v4.app.Fragment): SupportFragmentIntentHandler + fun createIntentHandler(fragment: androidx.fragment.app.Fragment): SupportFragmentIntentHandler /** * Same as {@link #startActivity(Intent, Bundle)} with no options specified. diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/providers/FileProvider.java b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/providers/FileProvider.java index 6b720a2..309ada9 100644 --- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/providers/FileProvider.java +++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/providers/FileProvider.java @@ -2,15 +2,15 @@ import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.webkit.URLUtil; import com.omega_r.libs.omegaintentbuilder.BuildConfig; import java.io.File; -public class FileProvider extends android.support.v4.content.FileProvider { +public class FileProvider extends androidx.core.content.FileProvider { public static Uri getLocalFileUri(Context context, File file) { return getUriForFile(context, context.getPackageName() + "." + BuildConfig.SUFFIX_AUTHORITY, file); diff --git a/examples/build.gradle b/examples/build.gradle index 53d1020..a897f5c 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -14,7 +14,7 @@ android { targetSdkVersion rootProject.ext.sdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true javaCompileOptions { @@ -33,20 +33,20 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:appcompat-v7:$supportVersion" + implementation "androidx.appcompat:appcompat:$androidX" api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation "com.android.support:support-v4:$supportVersion" - implementation "com.android.support:design:$supportVersion" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.0.0' api project(':core') api project(':annotations') kapt project(':processor') testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } repositories { diff --git a/examples/src/androidTest/java/com/omega_r/omegaintentbuilder/ExampleInstrumentedTest.java b/examples/src/androidTest/java/com/omega_r/omegaintentbuilder/ExampleInstrumentedTest.java index ce0cafc..30ef0d0 100644 --- a/examples/src/androidTest/java/com/omega_r/omegaintentbuilder/ExampleInstrumentedTest.java +++ b/examples/src/androidTest/java/com/omega_r/omegaintentbuilder/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.omega_r.omegaintentbuilder; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/BaseActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/BaseActivity.java index 069b7a4..0d3cb15 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/BaseActivity.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/BaseActivity.java @@ -1,7 +1,7 @@ package com.omega_r.omegaintentbuilder; import android.app.ProgressDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import org.jetbrains.annotations.Nullable; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/PhotoCaptureActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/PhotoCaptureActivity.java index fbc042f..bf1e8a6 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/PhotoCaptureActivity.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/PhotoCaptureActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.graphics.Bitmap; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.ImageView; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/SpeechToTextActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/SpeechToTextActivity.java index 69d078e..214e016 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/SpeechToTextActivity.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/SpeechToTextActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.speech.RecognizerIntent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.TextView; @@ -11,7 +11,6 @@ import com.omega_r.libs.omegaintentbuilder.handlers.ActivityResultCallback; import org.jetbrains.annotations.Nullable; -import org.w3c.dom.Text; import java.util.List; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/TabActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/TabActivity.java index e3bbead..125d76d 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/TabActivity.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/TabActivity.java @@ -1,13 +1,13 @@ package com.omega_r.omegaintentbuilder; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import com.omega_r.libs.omegafragmentbuilder.AppOmegaFragmentBuilder; import com.omega_r.omegaintentbuilder.fragments.FirstFragment; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/BaseFragment.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/BaseFragment.java index 76dcacb..238346c 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/BaseFragment.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/BaseFragment.java @@ -1,6 +1,6 @@ package com.omega_r.omegaintentbuilder.fragments; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; public class BaseFragment extends Fragment { diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/FirstFragment.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/FirstFragment.java index 3fbac60..a58908a 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/FirstFragment.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/FirstFragment.java @@ -1,8 +1,8 @@ package com.omega_r.omegaintentbuilder.fragments; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/SecondFragment.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/SecondFragment.java index 0ac3018..ecb8d97 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/SecondFragment.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/fragments/SecondFragment.java @@ -1,8 +1,8 @@ package com.omega_r.omegaintentbuilder.fragments; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/service_example/TestService.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/service_example/TestService.java index c34b839..9d031ca 100644 --- a/examples/src/main/java/com/omega_r/omegaintentbuilder/service_example/TestService.java +++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/service_example/TestService.java @@ -2,7 +2,7 @@ import android.app.IntentService; import android.content.Intent; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.omega_r.libs.omegaintentbuilder.AppOmegaIntentBuilder; diff --git a/examples/src/main/res/layout/activity_main.xml b/examples/src/main/res/layout/activity_main.xml index e75be35..bced2b2 100644 --- a/examples/src/main/res/layout/activity_main.xml +++ b/examples/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/examples/src/main/res/layout/activity_tab.xml b/examples/src/main/res/layout/activity_tab.xml index 850ba84..75b482b 100644 --- a/examples/src/main/res/layout/activity_tab.xml +++ b/examples/src/main/res/layout/activity_tab.xml @@ -1,5 +1,5 @@ - - - - - + - + - - + diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/processor/src/main/java/omega/com/processor/AnnotationProcessor.java b/processor/src/main/java/omega/com/processor/AnnotationProcessor.java index 840b8ba..1020e0b 100644 --- a/processor/src/main/java/omega/com/processor/AnnotationProcessor.java +++ b/processor/src/main/java/omega/com/processor/AnnotationProcessor.java @@ -55,7 +55,7 @@ public class AnnotationProcessor extends AbstractProcessor { private static final ClassName sClassContext = ClassName.get("android.content", "Context"); private static final ClassName sClassActivity = ClassName.get("android.app", "Activity"); private static final ClassName sClassFragment = ClassName.get("android.app", "Fragment"); - private static final ClassName sClassSupportFragment = ClassName.get("android.support.v4.app", "Fragment"); + private static final ClassName sClassSupportFragment = ClassName.get("androidx.fragment.app", "Fragment"); private static final ClassName sClassService = ClassName.get("android.app", "Service"); private static final ClassName sClassBundle = ClassName.get("android.os", "Bundle");