Skip to content

Commit

Permalink
- fixing dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oleksiyp committed Apr 19, 2020
1 parent 1ff44ee commit 449a527
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 21 deletions.
10 changes: 5 additions & 5 deletions agent/android/build.gradle
Expand Up @@ -78,11 +78,11 @@ android {


dependencies {
implementation project(':mockk-agent-api')
implementation project(':mockk-agent-common')
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.linkedin.dexmaker:dexmaker:$dexmaker_version"
implementation "org.objenesis:objenesis:$objenesis_version"
api project(':mockk-agent-api')
api project(':mockk-agent-common')
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
api "com.linkedin.dexmaker:dexmaker:$dexmaker_version"
api "org.objenesis:objenesis:$objenesis_version"
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
Expand Down
2 changes: 1 addition & 1 deletion agent/common/build.gradle
Expand Up @@ -9,5 +9,5 @@ apply from: "${gradles}/upload.gradle"
apply from: "${gradles}/additional-archives.gradle"

dependencies {
implementation project(path: ':mockk-agent-api')
api project(path: ':mockk-agent-api')
}
10 changes: 5 additions & 5 deletions agent/jvm/build.gradle
Expand Up @@ -9,13 +9,13 @@ apply from: "${gradles}/upload.gradle"
apply from: "${gradles}/additional-archives.gradle"

dependencies {
implementation project(':mockk-agent-api')
implementation project(':mockk-agent-common')
api project(':mockk-agent-api')
api project(':mockk-agent-common')

implementation "org.objenesis:objenesis:$objenesis_version"
api "org.objenesis:objenesis:$objenesis_version"

implementation "net.bytebuddy:byte-buddy:$byte_buddy_version"
implementation "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
api "net.bytebuddy:byte-buddy:$byte_buddy_version"
api "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
}

task copyMockKDispatcher(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/js-module.gradle
@@ -1,7 +1,7 @@
apply plugin: 'kotlin-platform-js'

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
testImplementation "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
}

Expand Down
6 changes: 3 additions & 3 deletions mockk/android/build.gradle
Expand Up @@ -42,14 +42,14 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// very weird hack to make it working in IDE (check settings.gradle)
def mockKProject = findProject(':mockk-jvm') ?: project(":mockk")
implementation(mockKProject, {
api(mockKProject, {
exclude group: 'io.mockk', module: 'mockk-agent-jvm'
})
implementation project(":mockk-agent-android")
implementation project(":mockk-agent-api")
api project(":mockk-agent-api")

testImplementation 'junit:junit:4.12'
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
Expand Down
2 changes: 1 addition & 1 deletion mockk/common/build.gradle
Expand Up @@ -7,5 +7,5 @@ apply from: "${gradles}/upload.gradle"
apply from: "${gradles}/additional-archives.gradle"

dependencies {
implementation project(":mockk-dsl")
api project(":mockk-dsl")
}
2 changes: 1 addition & 1 deletion mockk/js/build.gradle
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'com.moowork.node'

dependencies {
expectedBy project(":mockk-common")
implementation project(":mockk-dsl-js")
api project(":mockk-dsl-js")
}

task sourcesJar(type: Jar) {
Expand Down
5 changes: 1 addition & 4 deletions mockk/jvm/build.gradle
Expand Up @@ -10,17 +10,14 @@ apply from: "${gradles}/additional-archives.gradle"

dependencies {
expectedBy project(':mockk-common')
implementation project(':mockk-dsl-jvm')
api project(':mockk-dsl-jvm')
implementation project(":mockk-agent-jvm")
implementation project(":mockk-agent-api")

implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
compileOnly 'org.slf4j:slf4j-api:1.7.26'

testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

runtimeOnly project(":mockk-common")
}

evaluationDependsOn(":mockk-common")
Expand Down

0 comments on commit 449a527

Please sign in to comment.