Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Commit

Permalink
Rename modules for jetpack.io releases.
Browse files Browse the repository at this point in the history
Related to #5
  • Loading branch information
michalharakal committed Mar 3, 2020
1 parent 5367fb9 commit e56d08b
Show file tree
Hide file tree
Showing 20 changed files with 54 additions and 249 deletions.
5 changes: 4 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ buildscript {
}
}

group = "com.github.dukecon"
version = "0.0.1"

allprojects {
repositories {
google()
Expand All @@ -44,4 +47,4 @@ allprojects {

tasks.register("clean", Delete::class).configure {
delete(rootProject.buildDir)
}
}
9 changes: 9 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@ gradlePlugin {
id = "loc-plugin"
implementationClass = "org.dukecon.plugin.LocPlugin"
}
register("PoetGeneratorPlugin") {
id = "poet-generator-plugin"
implementationClass = "org.dukecon.plugin.openapi.PoetGeneratorPlugin"
}

register("DependencyGraphGenerator") {
id = "project-dependencies-graph-plugin"
implementationClass = "plugins.graph.DependencyGraphGeneratorPlugin"
}

register("KtorOpenApiGenerator") {
id = "ktor-open-api-plugin"
implementationClass = "org.dukecon.plugin.openapi.NetworkGeneratorPlugin"
Expand All @@ -47,7 +53,10 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
implementation("guru.nidi:graphviz-java:0.12.1")
implementation("org.openapitools:openapi-generator-gradle-plugin:4.2.3")
implementation("com.squareup:kotlinpoet:1.5.0")
//implementation( "com.reprezen.kaizen:openapi-parser:4.0.4")
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
//implementation( "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
}

configurations.all {
Expand Down
6 changes: 0 additions & 6 deletions buildSrc/src/main/kotlin/Deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ object Deps {
iosX64 = "com.russhwolf:multiplatform-settings-iosx64:${Versions.Libs.MultiPlatform.settings}",
iosArm64 = "com.russhwolf:multiplatform-settings-iosarm64:${Versions.Libs.MultiPlatform.settings}"
)
val napier = MultiPlatformLibrary(
android = "com.github.aakira:napier-android:${Versions.Libs.MultiPlatform.napier}",
common = "com.github.aakira:napier:${Versions.Libs.MultiPlatform.napier}",
iosX64 = "com.github.aakira:napier-iosX64:${Versions.Libs.MultiPlatform.napier}",
iosArm64 = "com.github.aakira:napier-iosArm64:${Versions.Libs.MultiPlatform.napier}"
)
}
}

Expand Down
8 changes: 8 additions & 0 deletions common/backend/dukecon/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ android {
setDefaults()
}

/*
tasks.withType<org.dukecon.plugin.openapi.PoetOpenApiTask>().all {
openApiSpec = "$rootDir/specs/conference_api.json"
apiPackage = "org.dukecon.remote.api"
modelPackage = "org.dukecon.remote.api"
}
*/

openApiGenerate {
inputSpec.set("$rootDir/specs/conference_api.json")
generatorName.set("kotlin-ktor-client")
Expand Down
1 change: 0 additions & 1 deletion common/backend/macoun/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies {
mppLibrary(Deps.Libs.MultiPlatform.ktorClientLogging)

mppLibrary(Deps.Libs.MultiPlatform.settings)
mppLibrary(Deps.Libs.MultiPlatform.napier)

mppModules.forEach { mppModule(it) }
}
102 changes: 22 additions & 80 deletions common/backend/sessionize/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,90 +1,32 @@
plugins {
kotlin("multiplatform")
id("kotlinx-serialization")
id(BuildPlugins.androidLibrary)
id(BuildPlugins.kotlinAndroidExtensions)
id("com.android.library")
id("kotlin-android-extensions")
id("dev.icerock.mobile.multiplatform")
}

android {
compileSdkVersion(AndroidSdk.compile)
defaultConfig {
minSdkVersion(AndroidSdk.min)
targetSdkVersion(AndroidSdk.target)
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
setDefaults()
}

dependencies {
implementation(Libraries.kotlinStdLib)
implementation(Libraries.kotlinxCoroutinesCore)
implementation(Libraries.kotlinxSerializeJvm)
implementation(Libraries.ktorUtilsJvm)
implementation(Libraries.ktorCoreJvm)
implementation(Libraries.ktorSerializationJvm)
implementation(Libraries.ktorLoggingJvm)
implementation(Libraries.ktorOkhttpJvm)

implementation("org.slf4j:slf4j-api:1.7.28")
val mppModules = listOf(
Modules.MultiPlatform.data,
Modules.MultiPlatform.core
)

testImplementation(Libraries.kotlinTestJvm)
testImplementation(Libraries.kotlinxCoroutinesCore)
testImplementation(Libraries.kotlinTestJunit)
dependencies {
androidLibrary(Deps.Libs.Android.gson)
mppLibrary(Deps.Libs.MultiPlatform.kotlinStdLib)
mppLibrary(Deps.Libs.MultiPlatform.coroutines)
mppLibrary(Deps.Libs.MultiPlatform.serialization)
mppLibrary(Deps.Libs.MultiPlatform.ktorClient)
mppLibrary(Deps.Libs.MultiPlatform.ktorClientJson)
mppLibrary(Deps.Libs.MultiPlatform.ktorClientJsonSerializer)
mppLibrary(Deps.Libs.MultiPlatform.ktorUtils)
mppLibrary(Deps.Libs.MultiPlatform.ktorClientLogging)

mppLibrary(Deps.Libs.MultiPlatform.settings)

mppModules.forEach { mppModule(it) }
}

kotlin {
targets {
android()
jvm()
}
sourceSets {
val commonMain by getting {
dependencies {
implementation(project(":common:data"))

implementation(Libraries.kotlinStdLibCommon)
implementation(Libraries.kotlinxCoroutinesCommon)
implementation(Libraries.ktorCoreCommon)
implementation(Libraries.ktorUtilsCommon)
implementation(Libraries.ktorSerializationCommon)
implementation(Libraries.ktorLoggingCommon)
}
}

val commonTest by getting {
dependencies {
implementation(Libraries.kotlinTestCommon)
implementation(Libraries.kotlinTestAnnotations)
implementation(Libraries.kotlinxCoroutinesCommon)

}
}

val jvmMain by getting {
dependencies {
implementation(Libraries.kotlinStdLib)
implementation(Libraries.kotlinxCoroutinesCore)
implementation(Libraries.kotlinxSerializeJvm)
implementation(Libraries.ktorUtilsJvm)
implementation(Libraries.ktorCoreJvm)
implementation(Libraries.ktorSerializationJvm)
implementation(Libraries.ktorLoggingJvm)
implementation(Libraries.ktorOkhttpJvm)
}
}
val jvmTest by getting {
dependencies {
implementation(Libraries.kotlinTestJvm)
implementation(Libraries.kotlinxCoroutinesCore)
implementation(Libraries.kotlinTestJunit)
}
}
}
}
96 changes: 0 additions & 96 deletions common/combined/dukecon/build.gradle

This file was deleted.

44 changes: 0 additions & 44 deletions common/combined/dukecon/dukecon.podspec

This file was deleted.

2 changes: 1 addition & 1 deletion common/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
kotlin("multiplatform")
id("com.android.library")
id("dev.icerock.mobile.multiplatform")
id("maven-publish")
}

android {
Expand All @@ -14,5 +15,4 @@ dependencies {
mppLibrary(Deps.Libs.MultiPlatform.ktorUtils)

mppLibrary(Deps.Libs.MultiPlatform.settings)
mppLibrary(Deps.Libs.MultiPlatform.napier)
}
2 changes: 1 addition & 1 deletion common/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id("org.jetbrains.kotlin.multiplatform")
id("kotlinx-serialization")
id("dev.icerock.mobile.multiplatform")
id("maven-publish")
}

android {
Expand All @@ -24,7 +25,6 @@ dependencies {
mppLibrary(Deps.Libs.MultiPlatform.ktorClientLogging)

mppLibrary(Deps.Libs.MultiPlatform.settings)
mppLibrary(Deps.Libs.MultiPlatform.napier)

implementation("androidx.preference:preference:1.1.0")
}
2 changes: 1 addition & 1 deletion common/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id("com.android.library")
id("kotlin-android-extensions")
id("dev.icerock.mobile.multiplatform")
id("maven-publish")
}

android {
Expand All @@ -15,5 +16,4 @@ dependencies {
mppLibrary(Deps.Libs.MultiPlatform.ktorUtils)

mppLibrary(Deps.Libs.MultiPlatform.settings)
mppLibrary(Deps.Libs.MultiPlatform.napier)
}
Loading

0 comments on commit e56d08b

Please sign in to comment.