-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrading libs. Android is working, need to do the rest.
- Loading branch information
1 parent
777d19f
commit 65728ba
Showing
14 changed files
with
423 additions
and
382 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,3 +49,5 @@ yarn.lock | |
|
|
||
| # Mac | ||
| .DS_Store | ||
|
|
||
| .kotlin | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| plugins { | ||
| id("com.android.application") | ||
| id("kotlin-android") | ||
| alias(libs.plugins.dependency.guard) | ||
| alias(libs.plugins.compose.compiler) | ||
| } | ||
|
|
||
| android { | ||
| compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get()) | ||
|
|
||
| namespace = "com.handstandsam.shoppingapp" | ||
|
|
||
| defaultConfig { | ||
| applicationId = "com.handstandsam.shoppingapp" | ||
| minSdk = Integer.parseInt(libs.versions.android.min.sdk.get()) | ||
| targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get()) | ||
| versionCode = 1 | ||
| versionName = "1.0" | ||
| vectorDrawables.useSupportLibrary = true | ||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| testOptions { | ||
| execution = "ANDROIDX_TEST_ORCHESTRATOR" | ||
| animationsDisabled = true | ||
| } | ||
|
|
||
| // variantFilter { variant -> | ||
| // setIgnore(!variant.name.toLowerCase().endsWith("debug")) | ||
| // } | ||
|
|
||
| lint { | ||
| baseline = file("lint-baseline.xml") | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| // minifyEnabled = false | ||
| // proguardFiles = [getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'] | ||
| } | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose = true | ||
| } | ||
|
|
||
| kotlinOptions { | ||
| jvmTarget = JavaVersion.VERSION_1_8.toString() | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(project(":compose-ui")) | ||
|
|
||
| implementation(project(":models")) | ||
| implementation(project(":mock-data")) | ||
| implementation(project(":shopping-cart")) | ||
|
|
||
| // AndroidX Libraries | ||
| implementation(libs.androidx.appcompat.v7) | ||
| implementation(libs.androidx.material) | ||
| implementation(libs.androidx.lifecycle.runtime.ktx) | ||
|
|
||
| // Networking) | ||
| implementation(libs.glide) | ||
| implementation(libs.okhttp) | ||
| implementation(project(":networking")) | ||
| debugImplementation(libs.okhttp.logging.interceptor) | ||
|
|
||
| // Kotlin) | ||
| implementation(libs.kotlin.coroutines) | ||
| implementation(libs.kotlin.coroutines.android) | ||
|
|
||
| //Flavor Modules) | ||
| implementation(project(":app-flavor-inmemory")) | ||
| // implementation( project(":app-flavor-mockserver")) | ||
| // implementation( project(":app-flavor-liveserver")) | ||
|
|
||
| //Logging | ||
| implementation(libs.timber) | ||
|
|
||
| // Compose | ||
| // implementation( libs.androidx.compose.compiler) | ||
| implementation(libs.androidx.compose.runtime) | ||
| implementation(libs.androidx.compose.ui) | ||
| implementation(libs.androidx.compose.foundation) | ||
| implementation(libs.androidx.compose.material) | ||
| implementation(libs.androidx.compose.material.icons.extended) | ||
| implementation(libs.androidx.compose.animation) | ||
| implementation(libs.androidx.compose.ui.tooling) | ||
| implementation(libs.androidx.activity.compose) | ||
| implementation(libs.accompanist.coil) | ||
| implementation(libs.coil.compose) | ||
| implementation(libs.landscapist.coil) | ||
| implementation(libs.androidx.lifecycle.runtime.ktx) | ||
|
|
||
| //JVM Tests Only | ||
| testImplementation(libs.junit) | ||
|
|
||
| androidTestImplementation(libs.androidx.espresso) | ||
| androidTestImplementation(libs.androidx.espresso.contrib) | ||
| androidTestImplementation(libs.androidx.test.rules) | ||
| androidTestImplementation(libs.androidx.testrunner) | ||
| androidTestImplementation(project(":app-test-suite")) | ||
| } | ||
|
|
||
| dependencyGuard { | ||
| configuration("debugRuntimeClasspath") { | ||
| modules = true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,33 @@ | ||
| import org.jetbrains.compose.compose | ||
| import org.jetbrains.compose.desktop.application.dsl.TargetFormat | ||
|
|
||
| plugins { | ||
| kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22) | ||
| id("org.jetbrains.compose") | ||
| // alias(libs.plugins.kotlin.multiplatform) | ||
| kotlin("jvm") | ||
| alias(libs.plugins.compose.compiler) | ||
| alias(libs.plugins.jetbrains.compose) | ||
| application | ||
| } | ||
|
|
||
| kotlin { | ||
| jvm { | ||
| withJava() | ||
| } | ||
| sourceSets { | ||
| named("jvmMain") { | ||
| dependencies { | ||
| implementation(compose.desktop.currentOs) | ||
| implementation(project(":compose-ui")) | ||
| implementation(project(":mock-data")) | ||
| implementation(project(":models")) | ||
| implementation(project(":networking")) | ||
| implementation(project(":shopping-cart")) | ||
| } | ||
| } | ||
| } | ||
| dependencies { | ||
| implementation(compose.desktop.currentOs) | ||
| implementation(project(":compose-ui")) | ||
| implementation(project(":mock-data")) | ||
| implementation(project(":models")) | ||
| implementation(project(":networking")) | ||
| implementation(project(":shopping-cart")) | ||
| } | ||
|
|
||
| compose.desktop { | ||
| application { | ||
| mainClass = "com.handstandsam.shoppingapp.compose.MainKt" | ||
|
|
||
| nativeDistributions { | ||
| targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) | ||
| packageName = "ShoppingApp Desktop" | ||
| packageVersion = "1.0.0" | ||
| } | ||
| } | ||
| } | ||
| //compose.desktop { | ||
| //} | ||
|
|
||
|
|
||
| application { | ||
| mainClass = "com.handstandsam.shoppingapp.compose.MainKt" | ||
|
|
||
| // nativeDistributions { | ||
| // targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) | ||
| // packageName = "ShoppingApp Desktop" | ||
| // packageVersion = "1.0.0" | ||
| // } | ||
| } |
Oops, something went wrong.