Merge pull request #8 from zeoflow/dev/updated-gradle-tools

Upgraded `Android Build Tools` and `artifact` group
zeoflow · Jun 29, 2022 · ca60dda · ca60dda
2 parents 6ec9fc1 + 195b3a6
commit ca60dda
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zeoflow.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/demo/src/main/java/com/zeoflow/sample/MainActivity.java b/demo/src/main/java/com/zeoflow/sample/MainActivity.java
@@ -5,7 +5,7 @@
 import androidx.annotation.Nullable;
 
 import com.zeoflow.app.Activity;
-import com.zeoflow.startup.AppInitializer;
+import com.zeoflow.startup.ApplicationInitializer;
 import com.zeoflow.startup.R;
 
 public class MainActivity extends Activity {
@@ -15,7 +15,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        AppInitializer.getAppContext();
+        ApplicationInitializer.getAppContext();
     }
 
 }
diff --git a/docs/README.md b/docs/README.md
@@ -33,7 +33,9 @@ To use it:
     ```groovy
       dependencies {
         // ...
-        implementation 'com.zeoflow:startup:1.0.1'
+        implementation 'com.zeoflow.startup:startup:$version'
+        // kotlin
+        implementation 'com.zeoflow.startup:startup-ktx:$version'
         // ...
       }
     ```

diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,8 @@ kotlin.code.style=official
 # Maven
 POM_NAME=StartUp
 POM_PACKAGING=aar
-VERSION_NAME=1.0.1
-GROUP=com.zeoflow
+VERSION_NAME=1.1.0
+GROUP=com.zeoflow.startup
 POM_DESCRIPTION=StartUp provides a straightforward, performant way to initialize components (from library and/or application) at application startup.
 POM_URL=https://github.com/zeoflow/startup
 POM_SCM_URL=https://github.com/zeoflow/startup
@@ -38,11 +38,4 @@ POM_DEVELOPER_ID=zeoflow
 POM_DEVELOPER_NAME=ZeoFlow
 POM_DEVELOPER_EMAIL=open-source@zeoflow.com
 
-# sonatype elements
-
-# sonatype elements
-mavenCentralUsername=
-mavenCentralPassword=
-signing.keyId=
-signing.password=
 signing.secretKeyRingFile=../buildSrc/key.gpg
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun May 30 14:41:13 EEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/startup/build.gradle b/startup/build.gradle
@@ -4,8 +4,14 @@ plugins {
 }
 
 android {
+    namespace = "com.zeoflow.startup"
     compileSdk 32
 
+    defaultConfig {
+        minSdk 21
+        targetSdk 32
+    }
+
     buildTypes.all {
         consumerProguardFiles "proguard-rules.pro"
         multiDexKeepProguard file("multidex-rules.pro")

diff --git a/startup/multidex-rules.pro b/startup/multidex-rules.pro
@@ -1,2 +1,2 @@
--keep class com.zeoflow.startup.AppInitializer
+-keep class com.zeoflow.startup.ApplicationInitializer
 -keep class * extends com.zeoflow.startup.Initializer
diff --git a/startup/src/main/AndroidManifest.xml b/startup/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.zeoflow.startup">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
         <provider

diff --git a/...a/com/zeoflow/startup/AppInitializer.java → ...oflow/startup/ApplicationInitializer.java b/...a/com/zeoflow/startup/AppInitializer.java → ...oflow/startup/ApplicationInitializer.java
@@ -25,7 +25,6 @@
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.tracing.Trace;
 
 import java.util.HashMap;
@@ -35,20 +34,20 @@
 import java.util.Set;
 
 /**
- * An {@link AppInitializer} can be used to initialize all discovered [ComponentInitializer]s.
+ * An {@link ApplicationInitializer} can be used to initialize all discovered [ComponentInitializer]s.
  * <br/>
  * The discovery mechanism is via `<meta-data>` 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
@@ -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");
         }