Skip to content

Commit

Permalink
Upgrading libs. Android is working, need to do the rest.
Browse files Browse the repository at this point in the history
  • Loading branch information
handstandsam committed Jun 27, 2024
1 parent 777d19f commit b46666f
Show file tree
Hide file tree
Showing 16 changed files with 505 additions and 472 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ yarn.lock

# Mac
.DS_Store

.kotlin
120 changes: 0 additions & 120 deletions app/build.gradle

This file was deleted.

113 changes: 113 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
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
}

androidComponents {
beforeVariants { variantBuilder ->
if (variantBuilder.buildType != "debug") {
variantBuilder.enable = false
}
}
}

lint {
baseline = file("lint-baseline.xml")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

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
}
}
125 changes: 62 additions & 63 deletions app/dependencies/debugRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,69 @@ androidx.activity:activity-compose:1.7.2
androidx.activity:activity-ktx:1.7.2
androidx.activity:activity:1.7.2
androidx.annotation:annotation-experimental:1.3.0
androidx.annotation:annotation-jvm:1.6.0
androidx.annotation:annotation:1.6.0
androidx.annotation:annotation-jvm:1.7.0
androidx.annotation:annotation:1.7.0
androidx.appcompat:appcompat-resources:1.6.1
androidx.appcompat:appcompat:1.6.1
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
androidx.cardview:cardview:1.0.0
androidx.collection:collection:1.2.0
androidx.compose.animation:animation-android:1.5.1
androidx.compose.animation:animation-core-android:1.5.1
androidx.compose.animation:animation-core:1.5.1
androidx.compose.animation:animation:1.5.1
androidx.compose.compiler:compiler:1.5.3
androidx.compose.foundation:foundation-android:1.5.1
androidx.compose.foundation:foundation-layout-android:1.5.1
androidx.compose.foundation:foundation-layout:1.5.1
androidx.compose.foundation:foundation:1.5.1
androidx.compose.material:material-android:1.5.1
androidx.compose.material:material-icons-core-android:1.5.1
androidx.compose.material:material-icons-core:1.5.1
androidx.compose.material:material-icons-extended-android:1.5.1
androidx.compose.material:material-icons-extended:1.5.1
androidx.compose.material:material-ripple-android:1.5.1
androidx.compose.material:material-ripple:1.5.1
androidx.compose.material:material:1.5.1
androidx.compose.runtime:runtime-android:1.5.1
androidx.compose.runtime:runtime-saveable-android:1.5.1
androidx.compose.runtime:runtime-saveable:1.5.1
androidx.compose.runtime:runtime:1.5.1
androidx.compose.ui:ui-android:1.5.1
androidx.compose.ui:ui-geometry-android:1.5.1
androidx.compose.ui:ui-geometry:1.5.1
androidx.compose.ui:ui-graphics-android:1.5.1
androidx.compose.ui:ui-graphics:1.5.1
androidx.compose.ui:ui-text-android:1.5.1
androidx.compose.ui:ui-text:1.5.1
androidx.compose.ui:ui-tooling-android:1.5.1
androidx.compose.ui:ui-tooling-data-android:1.5.1
androidx.compose.ui:ui-tooling-data:1.5.1
androidx.compose.ui:ui-tooling-preview-android:1.5.1
androidx.compose.ui:ui-tooling-preview:1.5.1
androidx.compose.ui:ui-tooling:1.5.1
androidx.compose.ui:ui-unit-android:1.5.1
androidx.compose.ui:ui-unit:1.5.1
androidx.compose.ui:ui-util-android:1.5.1
androidx.compose.ui:ui-util:1.5.1
androidx.compose.ui:ui:1.5.1
androidx.collection:collection-jvm:1.4.0
androidx.collection:collection-ktx:1.4.0
androidx.collection:collection:1.4.0
androidx.compose.animation:animation-android:1.6.8
androidx.compose.animation:animation-core-android:1.6.8
androidx.compose.animation:animation-core:1.6.8
androidx.compose.animation:animation:1.6.8
androidx.compose.foundation:foundation-android:1.6.8
androidx.compose.foundation:foundation-layout-android:1.6.8
androidx.compose.foundation:foundation-layout:1.6.8
androidx.compose.foundation:foundation:1.6.8
androidx.compose.material:material-android:1.6.8
androidx.compose.material:material-icons-core-android:1.6.8
androidx.compose.material:material-icons-core:1.6.8
androidx.compose.material:material-icons-extended-android:1.6.8
androidx.compose.material:material-icons-extended:1.6.8
androidx.compose.material:material-ripple-android:1.6.8
androidx.compose.material:material-ripple:1.6.8
androidx.compose.material:material:1.6.8
androidx.compose.runtime:runtime-android:1.6.8
androidx.compose.runtime:runtime-saveable-android:1.6.8
androidx.compose.runtime:runtime-saveable:1.6.8
androidx.compose.runtime:runtime:1.6.8
androidx.compose.ui:ui-android:1.6.8
androidx.compose.ui:ui-geometry-android:1.6.8
androidx.compose.ui:ui-geometry:1.6.8
androidx.compose.ui:ui-graphics-android:1.6.8
androidx.compose.ui:ui-graphics:1.6.8
androidx.compose.ui:ui-text-android:1.6.8
androidx.compose.ui:ui-text:1.6.8
androidx.compose.ui:ui-tooling-android:1.6.8
androidx.compose.ui:ui-tooling-data-android:1.6.8
androidx.compose.ui:ui-tooling-data:1.6.8
androidx.compose.ui:ui-tooling-preview-android:1.6.8
androidx.compose.ui:ui-tooling-preview:1.6.8
androidx.compose.ui:ui-tooling:1.6.8
androidx.compose.ui:ui-unit-android:1.6.8
androidx.compose.ui:ui-unit:1.6.8
androidx.compose.ui:ui-util-android:1.6.8
androidx.compose.ui:ui-util:1.6.8
androidx.compose.ui:ui:1.6.8
androidx.concurrent:concurrent-futures:1.1.0
androidx.constraintlayout:constraintlayout-solver:2.0.1
androidx.constraintlayout:constraintlayout:2.0.1
androidx.coordinatorlayout:coordinatorlayout:1.1.0
androidx.core:core-ktx:1.10.0
androidx.core:core:1.10.0
androidx.core:core-ktx:1.12.0
androidx.core:core:1.12.0
androidx.cursoradapter:cursoradapter:1.0.0
androidx.customview:customview-poolingcontainer:1.0.0
androidx.customview:customview:1.1.0
androidx.documentfile:documentfile:1.0.0
androidx.drawerlayout:drawerlayout:1.1.1
androidx.dynamicanimation:dynamicanimation:1.0.0
androidx.emoji2:emoji2-views-helper:1.4.0
androidx.emoji2:emoji2:1.4.0
androidx.emoji2:emoji2-views-helper:1.3.0
androidx.emoji2:emoji2:1.3.0
androidx.exifinterface:exifinterface:1.3.3
androidx.fragment:fragment:1.3.6
androidx.interpolator:interpolator:1.0.0
Expand Down Expand Up @@ -144,24 +145,22 @@ io.ktor:ktor-websocket-serialization-jvm:2.1.0
io.ktor:ktor-websocket-serialization:2.1.0
io.ktor:ktor-websockets-jvm:2.1.0
io.ktor:ktor-websockets:2.1.0
org.jetbrains.compose.foundation:foundation:1.5.1
org.jetbrains.compose.material:material:1.5.1
org.jetbrains.compose.ui:ui:1.5.1
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.10
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.7.10
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
org.jetbrains.kotlin:kotlin-stdlib:1.9.10
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.7.3
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1
org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
org.jetbrains.kotlin:kotlin-stdlib:2.0.0
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.8.1
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1
org.jetbrains:annotations:23.0.0
org.slf4j:slf4j-api:1.7.36
Loading

0 comments on commit b46666f

Please sign in to comment.