Skip to content

Commit

Permalink
Merge pull request #19 from LachlanMcKee/update-compose-and-dagger
Browse files Browse the repository at this point in the history
Updated compose to 1.0.0-beta08 and dagger to 2.36
  • Loading branch information
LachlanMcKee authored Jun 6, 2021
2 parents f0fd9f9 + 56a4ea6 commit fa6f517
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 53 deletions.
43 changes: 0 additions & 43 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,6 @@ jobs:
workflow_id: update-screenshots-baseline.yml,pull-request.yml
access_token: ${{ github.token }}

unit-tests:
name: Unit tests
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v2

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- uses: gradle/wrapper-validation-action@v1

- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: 11.0.8

- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Unit tests
run: ./gradlew testDebugUnitTest
working-directory: .

- name: Upload instrumentation test reports
if: failure()
uses: actions/upload-artifact@v2
with:
name: instrumentation-failure-26
path: '**/build/reports'

- name: Cleanup Gradle Cache
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
instrumentation-tests:
name: Instrumentation tests
runs-on: macOS-latest
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
Change Log
===========

Version 1.0.0-alpha03 *(2021-06-06)*
----------------------------

* Updated to Compose 1.0.0-beta-08
* Updated to Dagger2 to 2.36
* Updated to Kotlin to 1.5.10


Version 1.0.0-alpha02 *(2021-05-21)*
----------------------------

* Updated to Compose Beta-07
* Updated to Compose 1.0.0-beta-07
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ To see this in practice, please take a look at the [sample](sample) directory.
This library is available on Maven, you can add it to your project using the following gradle dependencies:

```gradle
implementation 'net.lachlanmckee:hilt-compose-navigation-factory:1.0.0-alpha02'
annotationProcessor 'net.lachlanmckee:hilt-compose-navigation-factory-compiler:1.0.0-alpha02'
implementation 'net.lachlanmckee:hilt-compose-navigation-factory:1.0.0-alpha03'
annotationProcessor 'net.lachlanmckee:hilt-compose-navigation-factory-compiler:1.0.0-alpha03'
```
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ kotlin.code.style=official

# Maven
GROUP=net.lachlanmckee
VERSION_NAME=1.0.0-alpha02
VERSION_NAME=1.0.0-alpha03

POM_DESCRIPTION=Provides a mechanism to scale Jetpack Compose navigation across numerous modules.
POM_INCEPTION_YEAR=2021
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[versions]
compose = "1.0.0-beta07"
dagger = "2.35.1"
kotlin = "1.4.32"
compose = "1.0.0-beta08"
dagger = "2.36"
kotlin = "1.5.10"
espresso = "3.3.0"
androidXTest = "1.3.0"
compileSdk = "30"
minSdk = "21"
targetSdk = "30"

[libraries]
androidx-activityCompose = "androidx.activity:activity-compose:1.3.0-alpha08"
androidx-activityCompose = "androidx.activity:activity-compose:1.3.0-beta01"
androidx-appcompat = "androidx.appcompat:appcompat:1.3.0"
androidx-lifecycle-livedata = "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"

compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose" }
compose-navigation = "androidx.navigation:navigation-compose:2.4.0-alpha01"
compose-navigation = "androidx.navigation:navigation-compose:2.4.0-alpha02"

dagger-runtime = { module = "com.google.dagger:dagger", version.ref = "dagger" }
dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
Expand All @@ -35,7 +35,7 @@ espresso-orchestrator = { module = "androidx.test:orchestrator", version.ref = "
compose-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }

# Gradle plugins
plugin-androidTools = "com.android.tools.build:gradle:7.0.0-beta02"
plugin-androidTools = "com.android.tools.build:gradle:7.0.0-beta03"
plugin-hiltAndroidGradle = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger" }
plugin-kotlinGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
plugin-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.15.1"
Expand Down

0 comments on commit fa6f517

Please sign in to comment.