Add Hilt support

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
           SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
         run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
       - name: Release build and source jar generation
-        run: ./gradlew :rainbow-cake-core:assembleRelease :rainbow-cake-test:assembleRelease :rainbow-cake-dagger:assembleRelease :rainbow-cake-koin:assembleRelease :rainbow-cake-navigation:assembleRelease :rainbow-cake-timber:assembleRelease :rainbow-cake-core:androidSourcesJar :rainbow-cake-test:androidSourcesJar :rainbow-cake-dagger:androidSourcesJar :rainbow-cake-koin:androidSourcesJar :rainbow-cake-navigation:androidSourcesJar :rainbow-cake-timber:androidSourcesJar
+        run: ./gradlew :rainbow-cake-core:assembleRelease :rainbow-cake-test:assembleRelease :rainbow-cake-dagger:assembleRelease :rainbow-cake-hilt:assembleRelease :rainbow-cake-koin:assembleRelease :rainbow-cake-navigation:assembleRelease :rainbow-cake-timber:assembleRelease :rainbow-cake-core:androidSourcesJar :rainbow-cake-test:androidSourcesJar :rainbow-cake-dagger:androidSourcesJar :rainbow-cake-hilt:androidSourcesJar :rainbow-cake-koin:androidSourcesJar :rainbow-cake-navigation:androidSourcesJar :rainbow-cake-timber:androidSourcesJar
       - name: Publish to MavenCentral
         run: ./gradlew publishReleasePublicationToSonatypeRepository closeAndReleaseRepository
         env:

build.gradle

@@ -1,11 +1,12 @@
 buildscript {
     ext.rainbowcake_version = '1.4.0'
 
-    ext.kotlin_version = '1.5.10'
-    ext.coroutines_version = '1.5.0'
+    ext.kotlin_version = '1.5.30'
+    ext.coroutines_version = '1.5.1'
 
-    ext.dagger_version = '2.36'
-    ext.koin_version = '3.0.2'
+    ext.dagger_version = '2.38.1'
+    ext.koin_version = '3.1.2'
+    ext.hilt_version = '2.38.1'
 
     ext.target_sdk = 30
     ext.min_sdk = 19
@@ -17,9 +18,12 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.3.0'
+
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+
         classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
     }
 }

demo/build.gradle

@@ -33,9 +33,9 @@ dependencies {
     implementation project(':rainbow-cake-timber')
 
     // Google libraries
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

hilt-demo/.gitignore

@@ -0,0 +1 @@
+/build

hilt-demo/build.gradle

@@ -0,0 +1,46 @@
+apply plugin: 'com.android.application'
+apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion compile_sdk
+    defaultConfig {
+        applicationId "co.zsmb.rainbowcake.hiltdemo"
+        minSdkVersion min_sdk
+        targetSdkVersion target_sdk
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    // Architecture
+    implementation project(':rainbow-cake-core')
+    implementation project(':rainbow-cake-hilt')
+    implementation project(':rainbow-cake-navigation')
+    implementation project(':rainbow-cake-timber')
+
+    // Google libraries
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+
+    // Dagger Hilt
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
+
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

hilt-demo/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

hilt-demo/src/main/AndroidManifest.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="co.zsmb.rainbowcake.hiltdemo">
+
+    <application
+        android:name=".HiltDemoApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Rainbowcake">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/HiltDemoApplication.kt

@@ -0,0 +1,24 @@
+package co.zsmb.rainbowcake.hiltdemo
+
+import android.app.Application
+import co.zsmb.rainbowcake.config.Loggers
+import co.zsmb.rainbowcake.config.rainbowCake
+import co.zsmb.rainbowcake.timber.TIMBER
+import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
+
+@HiltAndroidApp
+class HiltDemoApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        rainbowCake {
+            logger = Loggers.TIMBER
+            isDebug = BuildConfig.DEBUG
+            consumeExecuteExceptions = !BuildConfig.DEBUG
+        }
+
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
+    }
+}

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/MainActivity.kt

@@ -0,0 +1,17 @@
+package co.zsmb.rainbowcake.hiltdemo
+
+import android.os.Bundle
+import co.zsmb.rainbowcake.hiltdemo.blank.BlankFragment
+import co.zsmb.rainbowcake.navigation.SimpleNavActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : SimpleNavActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            navigator.add(BlankFragment())
+        }
+    }
+}

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/blank/BlankFragment.kt

@@ -0,0 +1,23 @@
+package co.zsmb.rainbowcake.hiltdemo.blank
+
+import android.os.Bundle
+import android.view.View
+import co.zsmb.rainbowcake.base.RainbowCakeFragment
+import co.zsmb.rainbowcake.hilt.getViewModel
+import co.zsmb.rainbowcake.hiltdemo.R
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class BlankFragment : RainbowCakeFragment<BlankViewState, BlankViewModel>() {
+
+    override fun provideViewModel() = getViewModel()
+    override fun getViewResource() = R.layout.fragment_blank
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel.load()
+    }
+
+    override fun render(viewState: BlankViewState) = Unit
+}

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/blank/BlankPresenter.kt

@@ -0,0 +1,12 @@
+package co.zsmb.rainbowcake.hiltdemo.blank
+
+import co.zsmb.rainbowcake.withIOContext
+import javax.inject.Inject
+
+class BlankPresenter @Inject constructor(
+) {
+
+    suspend fun getData(): String = withIOContext {
+        ""
+    }
+}

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/blank/BlankViewModel.kt

@@ -0,0 +1,15 @@
+package co.zsmb.rainbowcake.hiltdemo.blank
+
+import co.zsmb.rainbowcake.base.RainbowCakeViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class BlankViewModel @Inject constructor(
+    private val presenter: BlankPresenter,
+) : RainbowCakeViewModel<BlankViewState>(Initial) {
+
+    fun load() = execute {
+        viewState = BlankReady(presenter.getData())
+    }
+}

hilt-demo/src/main/java/co/zsmb/rainbowcake/hiltdemo/blank/BlankViewState.kt

@@ -0,0 +1,7 @@
+package co.zsmb.rainbowcake.hiltdemo.blank
+
+sealed class BlankViewState
+
+object Initial : BlankViewState()
+
+data class BlankReady(val data: String = "") : BlankViewState()

hilt-demo/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>