Skip to content

Commit 6d33612

Browse files
authored
Merge pull request #39 from jarroyoesp/feature/update-dependencies
Feature/update dependencies
2 parents 745b6f0 + 760976d commit 6d33612

67 files changed

Lines changed: 6983 additions & 6698 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Detekt
8080
uses: gradle/gradle-build-action@v2
8181
with:
82-
arguments: detektMain detektTest
82+
arguments: detekt
8383

8484
- name: Spotless
8585
uses: gradle/gradle-build-action@v2

.idea/compiler.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![CI-MASTER](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml)
2-
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.9.3)
3-
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.21-blue?logo=kotlin&logoColor=white)
2+
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.10.1)
3+
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.10-blue?logo=kotlin&logoColor=white)
44
<div align="center">
55
<img alt="Compose multiplatform charts" src="./screenshots/compose_multiplatform_logo.png"/>
66
<h1>🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform</h1>

app/build.gradle.kts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
1+
import com.android.build.api.dsl.ApplicationExtension
2+
13
plugins {
2-
id ("composeapp.android-app-conventions")
3-
alias(libs.plugins.tripletplay)
4+
id("composeapp.android-app-conventions")
5+
}
6+
7+
base {
8+
archivesName.set("composeapp")
49
}
510

6-
android {
11+
configure<ApplicationExtension> {
12+
namespace = config.android.applicationId.get()
713
defaultConfig {
814
applicationId = config.android.applicationId.get()
9-
setProperty("archivesBaseName", "composeapp")
15+
namespace = config.android.applicationId.get()
16+
1017

11-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" // https://github.com/google/dagger/issues/2033
18+
testInstrumentationRunner =
19+
"androidx.test.runner.AndroidJUnitRunner"
1220

1321
vectorDrawables.useSupportLibrary = true
1422
}
23+
1524
buildTypes {
1625
getByName("debug") {
17-
namespace = config.android.applicationId.get() + ".debug"
1826
applicationIdSuffix = ".debug"
1927
}
2028
getByName("release") {
21-
namespace = config.android.applicationId.get()
2229
isShrinkResources = true
2330
isMinifyEnabled = true
24-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
31+
proguardFiles(
32+
getDefaultProguardFile("proguard-android-optimize.txt"),
33+
"proguard-rules.pro"
34+
)
2535
}
2636
}
2737
}
@@ -35,6 +45,7 @@ dependencies {
3545
implementation(libs.jetbrains.compose.ui)
3646
implementation(libs.jetbrains.compose.material3)
3747
implementation(libs.koin.android)
48+
implementation(libs.androidx.core.ktx)
3849
testImplementation(libs.junit)
3950
androidTestImplementation(libs.junit)
4051
androidTestImplementation(libs.androidx.test.espresso.core)

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<activity
1717
android:name=".MainActivity"
1818
android:exported="true"
19-
android:label="@string/app_name"
2019
android:theme="@style/Theme.ComposeApp">
2120
<intent-filter>
2221
<action android:name="android.intent.action.MAIN" />

app/src/main/res/drawable-v24/ic_launcher_foreground.xml renamed to app/src/main/res/drawable/ic_launcher_foreground.xml

File renamed without changes.

app/src/main/res/values/colors.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
3-
<color name="purple_200">#FFBB86FC</color>
4-
<color name="purple_500">#FF6200EE</color>
5-
<color name="purple_700">#FF3700B3</color>
6-
<color name="teal_200">#FF03DAC5</color>
7-
<color name="teal_700">#FF018786</color>
8-
<color name="black">#FF000000</color>
9-
<color name="white">#FFFFFFFF</color>
10-
</resources>
2+
<resources />

0 commit comments

Comments
 (0)