Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make :tangle-api a regular jar artifact #289

Merged
merged 4 commits into from
Sep 4, 2021
Merged

make :tangle-api a regular jar artifact #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a75d23
make :tangle-api a regular jar artifact
RBusarow Sep 4, 2021
b2d5d6e
make :tangle-api a regular jar artifact
RBusarow Sep 4, 2021
965571e
Merge remote-tracking branch 'origin/tangle-api_jar' into tangle-api_jar
RBusarow Sep 4, 2021
0addeee
Merge branch 'main' into tangle-api_jar
kodiakhq[bot] Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ apiValidation {
ignoredProjects.addAll(
listOf(
"tangle-test-utils",
"tangle-test-utils-android",
"tangle-compiler",
"tangle-fragment-compiler",
"tangle-viewmodel-compiler",
Expand Down
15 changes: 15 additions & 0 deletions buildSrc/src/main/kotlin/common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,18 @@ fun Project.common() {
dependsOn(dependencySyncTasks)
}
}

fun Project.experimentalAnvil() {

tasks.withType<KotlinCompile>()
.configureEach {

kotlinOptions {

freeCompilerArgs = freeCompilerArgs + listOf(
"-Xopt-in=com.squareup.anvil.annotations.ExperimentalAnvilApi"
)
}
}

}
11 changes: 0 additions & 11 deletions buildSrc/src/main/kotlin/javaLibrary.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,3 @@ val testJvm by tasks.registering {
val buildTests by tasks.registering {
dependsOn("testClasses")
}

tasks.withType<KotlinCompile>()
.configureEach {

kotlinOptions {

freeCompilerArgs = freeCompilerArgs + listOf(
"-Xopt-in=com.squareup.anvil.annotations.ExperimentalAnvilApi"
)
}
}
1 change: 0 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ include(
":tangle-fragment-compiler",
":tangle-gradle-plugin",
":tangle-test-utils",
":tangle-test-utils-android",
":tangle-viewmodel-activity",
":tangle-viewmodel-api",
":tangle-viewmodel-compiler",
Expand Down
8 changes: 6 additions & 2 deletions tangle-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@
*/

plugins {
androidLibrary
javaLibrary
id("com.vanniktech.maven.publish")
}

kotlin {
explicitApi()
}

dependencies {

api(libs.androidx.annotations)
api(libs.google.dagger.api)

testImplementation(projects.tangleTestUtils)
testImplementation(projects.tangleTestUtilsAndroid)
}
2 changes: 1 addition & 1 deletion tangle-api/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
#
POM_ARTIFACT_ID=tangle-api
POM_NAME=tangle-api
POM_PACKAGING=aar
POM_PACKAGING=jar
16 changes: 0 additions & 16 deletions tangle-api/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions tangle-api/src/test/kotlin/tangle/inject/samples/TangleGraphSample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

package tangle.inject.samples

import android.app.Application
import tangle.inject.TangleGraph
import tangle.inject.test.utils.DaggerMyAppComponent
import tangle.inject.test.utils.Application
import tangle.inject.test.utils.DaggerAppComponent
import tangle.inject.test.utils.Sample

class TangleGraphSample {
Expand All @@ -29,7 +29,7 @@ class TangleGraphSample {
override fun onCreate() {
super.onCreate()

val appComponent = DaggerMyAppComponent.factory()
val appComponent = DaggerAppComponent.factory()
.create(this)

TangleGraph.init(appComponent)
Expand Down
2 changes: 2 additions & 0 deletions tangle-compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ plugins {
id("com.vanniktech.maven.publish")
}

experimentalAnvil()

dependencies {

api(libs.kotlin.compiler)
Expand Down
2 changes: 2 additions & 0 deletions tangle-fragment-compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ plugins {
kotlin("kapt")
}

experimentalAnvil()

dependencies {

kapt(libs.google.auto.service.processor)
Expand Down
28 changes: 0 additions & 28 deletions tangle-test-utils-android/build.gradle.kts
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions tangle-test-utils-android/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions tangle-test-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ plugins {
kotlin("kapt")
}

experimentalAnvil()

dependencies {

kapt(libs.google.auto.service.processor)
Expand Down
10 changes: 8 additions & 2 deletions ...angle/inject/test/utils/MyAppComponent.kt → ...angle/inject/test/utils/MyAppComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package tangle.inject.test.utils

import android.app.Application
import dagger.BindsInstance
import dagger.Component

Expand All @@ -26,10 +25,17 @@ interface MyAppComponent {
@Component.Factory
fun interface Factory {

fun create(@BindsInstance application: Application): MyAppComponent
fun create(
@BindsInstance
application: Application
): MyAppComponent
}
}

open class Application {
open fun onCreate() = Unit
}

object DaggerAppComponent : MyAppComponent {

fun factory() = MyAppComponent.Factory {
Expand Down
1 change: 0 additions & 1 deletion tangle-viewmodel-activity/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ dependencies {
testImplementation(projects.tangleFragmentApi)
testImplementation(projects.tangleFragmentCompiler)
testImplementation(projects.tangleTestUtils)
testImplementation(projects.tangleTestUtilsAndroid)
testImplementation(projects.tangleViewmodelCompiler)
}
1 change: 0 additions & 1 deletion tangle-viewmodel-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies {
testImplementation(projects.tangleFragmentApi)
testImplementation(projects.tangleFragmentCompiler)
testImplementation(projects.tangleTestUtils)
testImplementation(projects.tangleTestUtilsAndroid)
testImplementation(projects.tangleViewmodelActivity)
testImplementation(projects.tangleViewmodelCompiler)
testImplementation(projects.tangleViewmodelFragment)
Expand Down
2 changes: 2 additions & 0 deletions tangle-viewmodel-compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ plugins {
kotlin("kapt")
}

experimentalAnvil()

dependencies {

kapt(libs.google.auto.service.processor)
Expand Down
1 change: 0 additions & 1 deletion tangle-viewmodel-fragment/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ dependencies {
testImplementation(projects.tangleFragmentApi)
testImplementation(projects.tangleFragmentCompiler)
testImplementation(projects.tangleTestUtils)
testImplementation(projects.tangleTestUtilsAndroid)
testImplementation(projects.tangleViewmodelCompiler)
}
1 change: 0 additions & 1 deletion tangle-work-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies {
testImplementation(projects.tangleFragmentApi)
testImplementation(projects.tangleFragmentCompiler)
testImplementation(projects.tangleTestUtils)
testImplementation(projects.tangleTestUtilsAndroid)
testImplementation(projects.tangleViewmodelApi)
testImplementation(projects.tangleViewmodelCompiler)
testImplementation(projects.tangleWorkCompiler)
Expand Down
2 changes: 1 addition & 1 deletion tangle-work-api/src/test/kotlin/tangle/work/samples/TangleWorkerFactorySample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

package tangle.work.samples

import android.app.Application
import androidx.work.Configuration
import tangle.inject.TangleGraph
import tangle.inject.test.utils.Application
import tangle.inject.test.utils.DaggerAppComponent
import tangle.inject.test.utils.MyApplicationComponent
import tangle.inject.test.utils.Sample
Expand Down
2 changes: 2 additions & 0 deletions tangle-work-compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ plugins {
kotlin("kapt")
}

experimentalAnvil()

dependencies {

kapt(libs.google.auto.service.processor)
Expand Down