Skip to content

Commit

Permalink
Merge pull request #36 from zeoflow/memo-annotation-dependencies
Browse files Browse the repository at this point in the history
Fixed dependencies for the `memo-annotation` module
  • Loading branch information
teogor authored Apr 12, 2021
2 parents c6321ee + 27cb0f2 commit 849b7c6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
8 changes: 4 additions & 4 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ android {
}

dependencies {
implementation project(path: ':memo')
implementation project(path: ':memo-annotation')
annotationProcessor project(path: ':memo-compiler')

implementation("com.zeoflow:zson:1.3.0")
implementation("com.zeoflow:flow-kit:1.5.0")
implementation("com.zeoflow:material-elements:2.4.1")

implementation("com.zeoflow:parcelled-runtime:1.1.0")
annotationProcessor("com.zeoflow:parcelled-compiler:1.1.0")

implementation project(":memo")
implementation project(":memo-annotation")
annotationProcessor project(":memo-compiler")
}
3 changes: 1 addition & 2 deletions memo-annotation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ android {
}

dependencies {
api "androidx.annotation:annotation:1.2.0"
implementation project(":memo")
api("androidx.annotation:annotation:1.2.0")
}

apply from: "${rootProject.projectDir}/buildSrc/upload.gradle"
10 changes: 5 additions & 5 deletions memo-compiler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ android {
}

dependencies {
implementation project(":memo")
implementation project(":memo-annotation")
implementation project(path: ':memo')
implementation project(path: ':memo-annotation')

implementation("com.zeoflow:jx:1.2.0")

implementation "com.google.auto.service:auto-service-annotations:1.0-rc7"
implementation("com.google.auto.service:auto-service-annotations:1.0-rc7")
annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
api "com.google.guava:guava:28.2-jre"
api("com.google.guava:guava:28.2-jre")

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
}

apply from: "${rootProject.projectDir}/buildSrc/upload.gradle"
8 changes: 4 additions & 4 deletions memo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ android {
}

dependencies {
implementation 'com.zeoflow:zson:1.3.0'
implementation("com.zeoflow:zson:1.3.0")

implementation 'com.facebook.conceal:conceal:1.1.3@aar'
implementation("com.facebook.conceal:conceal:1.1.3@aar")

implementation "androidx.annotation:annotation:1.3.0-alpha01"
implementation("androidx.annotation:annotation:1.3.0-alpha01")

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
}

apply from: "${rootProject.projectDir}/buildSrc/upload.gradle"

0 comments on commit 849b7c6

Please sign in to comment.