Skip to content

Commit

Permalink
Merge pull request #41 from rainbowcake/dev
Browse files Browse the repository at this point in the history
Release 1.5.0
  • Loading branch information
zsmb13 committed Aug 31, 2021
2 parents 7084d60 + bbc2f96 commit 8054c98
Show file tree
Hide file tree
Showing 60 changed files with 979 additions and 382 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,30 @@ name: Build and test
on: [push, pull_request]

jobs:
api_check:
name: API check
runs-on: ubuntu-18.04
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
- name: API check
run: ./gradlew apiCheck
test:
name: Build and test
runs-on: macOS-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: adopt
java-version: 11
- name: Debug build
run: ./gradlew assembleDebug --stacktrace
- name: Unit test
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: adopt
java-version: 11
- name: Create secrets file
env:
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
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 assembleRelease androidSourcesJar -x :demo:assembleRelease -x :hilt-demo:assembleRelease
- name: Publish to MavenCentral
run: ./gradlew publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
env:
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,19 @@ It ships in several artifacts - feel free to pick and choose from them (for more

```groovy
dependencies {
implementation "co.zsmb:rainbow-cake-core:1.4.0" // Core library (required)
implementation "co.zsmb:rainbow-cake-dagger:1.4.0" // Dagger 2 support
implementation "co.zsmb:rainbow-cake-koin:1.4.0" // Koin support
implementation "co.zsmb:rainbow-cake-navigation:1.4.0" // Navigation features
implementation "co.zsmb:rainbow-cake-timber:1.4.0" // Internal logging through Timber
testImplementation "co.zsmb:rainbow-cake-test:1.4.0" // Testing utilities
implementation "co.zsmb:rainbow-cake-core:1.5.0" // Core library (required)
implementation "co.zsmb:rainbow-cake-dagger:1.5.0" // Dagger 2 support
implementation "co.zsmb:rainbow-cake-hilt:1.5.0" // Dagger Hilt support
implementation "co.zsmb:rainbow-cake-koin:1.5.0" // Koin support
implementation "co.zsmb:rainbow-cake-navigation:1.5.0" // Navigation features
implementation "co.zsmb:rainbow-cake-timber:1.5.0" // Internal logging through Timber
testImplementation "co.zsmb:rainbow-cake-test:1.5.0" // Testing utilities
}
```

# License

Copyright 2020 Marton Braun
Copyright 2021 Marton Braun

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
28 changes: 18 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext.rainbowcake_version = '1.4.0'
ext.rainbowcake_version = '1.5.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.target_sdk = 30
ext.min_sdk = 19
Expand All @@ -17,9 +17,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:7.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.3.0'
classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0'

classpath "com.google.dagger:hilt-android-gradle-plugin:$dagger_version"

classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
}
}
Expand All @@ -35,7 +38,7 @@ subprojects { project ->
group = 'co.zsmb'
version = rainbowcake_version
afterEvaluate { p ->
if (p.hasProperty("android")) {
plugins.withId('com.android.library') {
setAndroidProps(p)
}
}
Expand All @@ -60,6 +63,10 @@ void setAndroidProps(Project p) {
multiDexEnabled true
}
}

buildFeatures {
buildConfig false
}
}
}

Expand All @@ -71,10 +78,11 @@ apply plugin: 'binary-compatibility-validator'

apiValidation {
ignoredProjects += [
'demo'
'demo',
'hilt-demo',
]
nonPublicMarkers += [
'co.zsmb.rainbowcake.internal.InternalRainbowCakeApi'
'co.zsmb.rainbowcake.internal.InternalRainbowCakeApi',
]
}

Expand Down
8 changes: 4 additions & 4 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
compileSdkVersion compile_sdk
defaultConfig {
applicationId "co.zsmb.rainbowcake.demo"
minSdkVersion min_sdk
minSdkVersion 21
targetSdkVersion target_sdk
versionCode 1
versionName "1.0"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions hilt-demo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
46 changes: 46 additions & 0 deletions hilt-demo/build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
}
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:$dagger_version"
kapt "com.google.dagger:hilt-compiler:$dagger_version"

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
24 changes: 24 additions & 0 deletions hilt-demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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())
}
}
Original file line number Diff line number Diff line change
@@ -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())
}
}
}
Original file line number Diff line number Diff line change
@@ -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.getViewModelFromFactory
import co.zsmb.rainbowcake.hiltdemo.R
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class BlankFragment : RainbowCakeFragment<BlankViewState, BlankViewModel>() {

override fun provideViewModel() = getViewModelFromFactory()
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
}
Original file line number Diff line number Diff line change
@@ -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 {
""
}
}
Original file line number Diff line number Diff line change
@@ -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())
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package co.zsmb.rainbowcake.hiltdemo.blank

sealed class BlankViewState

object Initial : BlankViewState()

data class BlankReady(val data: String = "") : BlankViewState()
30 changes: 30 additions & 0 deletions hilt-demo/src/main/res/drawable-v24/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 8054c98

Please sign in to comment.