diff --git a/README.md b/README.md index df01f7c..698c1ef 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,9 @@ To use it: ```groovy dependencies { // ... - implementation 'com.zeoflow:startup:1.0.1' + implementation 'com.zeoflow:startup:$version' + // kotlin + implementation 'com.zeoflow:startup-ktx:$version' // ... } ``` diff --git a/build.gradle b/build.gradle index aea3d86..d5fc69b 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.20.0' } diff --git a/demo/build.gradle b/demo/build.gradle index 4d71501..bb152ef 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -18,18 +18,19 @@ android { } } - lintOptions { - abortOnError false - } - compileOptions { + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lint { + abortOnError false + } } dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation(project(':startup')) + implementation(project(':startup-ktx')) implementation("com.zeoflow:flow-kit:1.6.2") implementation("com.zeoflow:material-elements:2.5.0") diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 7f33fde..30a99c2 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + xmlns:tools="http://schemas.android.com/tools"> * The discovery mechanism is via `` entries in the merged `AndroidManifest.xml`. */ @SuppressWarnings("WeakerAccess") -public final class AppInitializer { +public final class ApplicationInitializer { // Tracing private static final String SECTION_NAME = "StartUp"; /** - * The {@link AppInitializer} instance. + * The {@link ApplicationInitializer} instance. */ - private static volatile AppInitializer sInstance; + private static volatile ApplicationInitializer sInstance; /** * Guards app initialization. @@ -65,11 +64,11 @@ public final class AppInitializer { final Context mContext; /** - * Creates an instance of {@link AppInitializer} + * Creates an instance of {@link ApplicationInitializer} * * @param context The application context */ - AppInitializer(@NonNull Context context) { + ApplicationInitializer(@NonNull Context context) { mContext = context.getApplicationContext(); mDiscovered = new HashSet<>(); mInitialized = new HashMap<>(); @@ -85,15 +84,15 @@ public static Context getAppContext() { /** * @param context The Application {@link Context} - * @return The instance of {@link AppInitializer} after initialization. + * @return The instance of {@link ApplicationInitializer} after initialization. */ @NonNull @SuppressWarnings("UnusedReturnValue") - public static AppInitializer getInstance(@NonNull Context context) { + public static ApplicationInitializer getInstance(@NonNull Context context) { if (sInstance == null) { synchronized (sLock) { if (sInstance == null) { - sInstance = new AppInitializer(context); + sInstance = new ApplicationInitializer(context); } } } diff --git a/startup/src/main/java/com/zeoflow/startup/InitializationProvider.java b/startup/src/main/java/com/zeoflow/startup/InitializationProvider.java index 8bba0b5..8e822cf 100644 --- a/startup/src/main/java/com/zeoflow/startup/InitializationProvider.java +++ b/startup/src/main/java/com/zeoflow/startup/InitializationProvider.java @@ -35,7 +35,7 @@ public class InitializationProvider extends ContentProvider { public final boolean onCreate() { Context context = getContext(); if (context != null) { - AppInitializer.getInstance(context).discoverAndInitialize(); + ApplicationInitializer.getInstance(context).discoverAndInitialize(); } else { throw new StartupException("Context cannot be null"); }