Skip to content

Commit

Permalink
clean ups
Browse files Browse the repository at this point in the history
  • Loading branch information
elihart committed Dec 6, 2021
1 parent 84b1dbd commit 061c99e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions showkase-browser-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ android {
}
configurations {
all {
// work around this error:
// Duplicate class org.intellij.lang.annotations.Identifier found in modules annotations-12.0 (com.intellij:annotations:12.0) and annotations-13.0 (org.jetbrains:annotations:13.0)
exclude group: "com.intellij", module: "annotations"
}
}
Expand Down
20 changes: 10 additions & 10 deletions showkase-processor-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ android {
packagingOptions {
exclude 'META-INF/gradle/incremental.annotation.processors'
exclude("META-INF/*.kotlin_module")
// Added to avoid this error -
// Execution failed for task ':app:mergeDebugAndroidTestJavaResource'.
// > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
// > 2 files found with path 'META-INF/AL2.0' from inputs:
exclude 'META-INF/AL2.0'
exclude 'META-INF/LGPL2.1'
}
defaultConfig {
minSdkVersion 26
Expand All @@ -34,15 +40,6 @@ android {
kotlinCompilerVersion "${versions.kotlinCompilerVersion}"
kotlinCompilerExtensionVersion "${versions.compose}"
}
// Added to avoid this error -
// Execution failed for task ':app:mergeDebugAndroidTestJavaResource'.
// > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
// > 2 files found with path 'META-INF/AL2.0' from inputs:
packagingOptions {
exclude 'META-INF/AL2.0'
exclude 'META-INF/LGPL2.1'
}

configurations {
all {
// work around this error:
Expand All @@ -53,7 +50,10 @@ android {
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// Allows this module to access the annotation processor related classes. Otherwise those are
// only available in java library modules. Inspiration -
// https://github.com/airbnb/epoxy/blob/master/epoxy-processortest/build.gradle
testImplementation files('libs/rt.jar')

// Support Libraries
implementation deps.support.appCompat
Expand Down

0 comments on commit 061c99e

Please sign in to comment.