Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,455 changes: 905 additions & 550 deletions app/versions/dependencies/debugRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

1,397 changes: 876 additions & 521 deletions app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

1,567 changes: 961 additions & 606 deletions app/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

1,497 changes: 926 additions & 571 deletions app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
android:value="" />
</activity>

<provider
android:name="org.jetbrains.compose.resources.AndroidContextProvider"
android:authorities="com.jarroyo.composeapp.debug.resources.AndroidContextProvider"
android:enabled="true"
android:exported="false" >
</provider>

<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
android:directBootAware="true"
android:exported="false"
android:initOrder="100" />
<provider
android:name="org.jetbrains.compose.resources.AndroidContextProvider"
android:authorities="com.jarroyo.composeapp.resources.AndroidContextProvider"
android:enabled="true"
android:exported="false" >
</provider>

<uses-library
android:name="androidx.window.extensions"
Expand Down
Binary file modified build-conventions/build/libs/build-conventions.jar
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import org.gradle.accessors.dm.LibrariesForLibs

plugins {
id ("composeapp.multiplatform-library-conventions")
}
val libs = the<LibrariesForLibs>()
android {
buildFeatures {
compose = true
}
}
kotlin {
sourceSets {
commonMain.dependencies {
api(project(":modules:library-feature"))

implementation(project(":modules:library-ui-shared"))
implementation(libs.androidx.compose.material3)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ kotlin {
val desktopMain by getting {
dependencies {
implementation(libs.coroutines.swing)
implementation(libs.ktor.client.cio)
implementation(libs.ktor.client.java)

}
}

Expand Down
20 changes: 17 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@ kotlinx-datetime="0.6.0"
ksp = "2.1.20-2.0.0"
ktlint = "0.43.0"
ktor = "3.0.1"
material3 = "1.7.3"
mockk = "1.13.16"
okhttp = "4.12.0"
prettier = "2.7.1"
sqlDelight = "2.0.2"
kotlinVersion = "2.1.20"
junitVersion = "1.2.1"

[libraries]
aboutlibraries = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutlibraries" }
Expand All @@ -50,12 +53,14 @@ androidx-compose-foundation = { module = "androidx.compose.foundation:foundation
androidx-compose-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.2" }
androidx-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
androidx-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "kotlin-multiplatform" }
androidx-compose-ui-graphics = { module = "org.jetbrains.compose.ui:ui-graphics", version.ref = "kotlin-multiplatform" }
androidx-compose-ui-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "kotlin-multiplatform" }
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "androidx-compose" }
androidx-compose-test = { module = "androidx.compose.test:test-core", version.ref = "androidx-compose" }
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
Expand Down Expand Up @@ -94,6 +99,8 @@ apollo-cache = { module = "com.apollographql.apollo:apollo-normalized-cache", ve
apollo-cache-sqlite = { module = "com.apollographql.apollo:apollo-normalized-cache-sqlite", version.ref = "apollo" }
apollo-testing-support = { module = "com.apollographql.apollo:apollo-testing-support", version.ref = "apollo" }
calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version = "2.5.4" }
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.6.3" }
composemultiplatformcharts2 = { module = "io.github.thechance101:chart", version = "Beta-0.0.5" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3" }
coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" }
coil-network = { module = "io.coil-kt.coil3:coil-network-ktor3", version = "3.0.4" }
Expand Down Expand Up @@ -138,10 +145,14 @@ kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.8" }
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.0" }
ksp-symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
ktor-client-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
Expand Down Expand Up @@ -190,6 +201,7 @@ plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", ver
plugin-versions = "com.github.ben-manes:gradle-versions-plugin:0.51.0"
plugin-versions-update = "nl.littlerobots.vcu:plugin:0.8.4"
plugin-violation = { module = "se.bjurr.violations:violation-comments-to-github-gradle-plugin", version = "1.70.0" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }

[plugins]
apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
Expand All @@ -201,3 +213,5 @@ multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatf
sqldelight = { id = "app.cash.sqldelight", version = "2.0.1" }
tripletplay = { id = "com.github.triplet.play", version = "3.12.1" }
com-android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions modules/feature-common-api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
23 changes: 23 additions & 0 deletions modules/feature-common-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
id("composeapp.multiplatform-library-conventions")
alias(libs.plugins.kotlinx.serialization)
}

android {
namespace = "com.jarroyo.feature.common.api"
resourcePrefix = "common_api_"
defaultConfig {
consumerProguardFiles("$projectDir/proguard-home-api-consumer-rules.pro")
}
}

kotlin {
sourceSets {
commonMain.dependencies {
api(libs.kotlinx.serialization)

implementation(projects.modules.libraryNavigationApi)
implementation(projects.modules.libraryNetworkApi)
}
}
}
Empty file.
21 changes: 21 additions & 0 deletions modules/feature-common-api/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
4 changes: 4 additions & 0 deletions modules/feature-common-api/src/commonMain/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jarroyo.feature.home.api.interactor
package com.jarroyo.feature.common.api.interactor

interface OpenUrlInBrowserInteractor {
suspend operator fun invoke(url: String)
Expand Down
1 change: 1 addition & 0 deletions modules/feature-common/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
45 changes: 45 additions & 0 deletions modules/feature-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
plugins {
id("composeapp.multiplatform-feature-conventions")
id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "com.jarroyo.feature.common"
sourceSets["main"].apply {
res.srcDirs("src/androidMain/res", "src/commonMain/resources")
}
}

kotlin {
// REVIEW reason of ld: framework 'FirebaseCore' not found
tasks.matching { it.name == "linkDebugTestIosSimulatorArm64" }.configureEach {
enabled = false
}
tasks.matching { it.name == "linkDebugTestIosX64" }.configureEach {
enabled = false
}
sourceSets {
androidMain.dependencies {
}
commonMain.dependencies {
implementation(compose.ui)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.runtime)
implementation(libs.kotlin.datetime)
implementation(libs.sqldelight.coroutines)

implementation(projects.modules.featureCommonApi)
implementation(projects.modules.libraryNavigation)
implementation(projects.modules.libraryNetworkApi)
implementation(projects.modules.libraryNetwork)
}

desktopMain.dependencies {
}

iosMain.dependencies {
}
}
}
Empty file.
21 changes: 21 additions & 0 deletions modules/feature-common/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jarroyo.feature.home.shared.interactor
package com.jarroyo.feature.common.interactor

import android.content.Context
import android.content.Intent
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.jarroyo.feature.common

import com.jarroyo.feature.common.api.interactor.OpenUrlInBrowserInteractor
import com.jarroyo.feature.common.interactor.OpenUrlInBrowserInteractorImpl
import com.jarroyo.library.feature.Feature
import org.koin.core.module.Module
import org.koin.dsl.module

class CommonFeature : Feature() {
override val id = "Common"

companion object {
val module: Module = module {
factory<OpenUrlInBrowserInteractor> { OpenUrlInBrowserInteractorImpl() }
}
}
}
Loading
Loading