Skip to content
Open
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: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Package Identity

Modular Android library consumed via Gradle composite builds. Provides shared authentication, networking, UI components, and
utilities across Infomaniak apps. Designed for JDK 17+, minSdk 27, compiled SDK 35.
utilities across Infomaniak apps. Designed for JDK 17+, minSdk 27, compiled SDK 37.

## Setup & Development

Expand Down
2 changes: 1 addition & 1 deletion Auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
plugins {
alias(core.plugins.infomaniak.android.library.flavor.aware)
alias(core.plugins.compose.compiler)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
alias(core.plugins.ksp)
alias(core.plugins.kotlin.serialization)
}
Expand Down
1 change: 1 addition & 0 deletions BugTracker/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies {
implementation(core.androidx.core.ktx)
implementation(core.androidx.lifecycle.viewmodel.ktx)
implementation(core.androidx.recyclerview)
implementation(core.material)

implementation(core.navigation.fragment.ktx)
implementation(core.navigation.ui.ktx)
Expand Down
1 change: 1 addition & 0 deletions Coil/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation(project(":Network"))
implementation(project(":Sentry"))

implementation(platform(core.compose.bom))
implementation(core.compose.material3)
implementation(core.androidx.core.ktx)
implementation(core.androidx.core)
Expand Down
2 changes: 1 addition & 1 deletion CrossAppLogin/Front/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
plugins {
alias(core.plugins.infomaniak.android.library.flavor.aware)
alias(core.plugins.compose.compiler)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
alias(core.plugins.navigation.safeargs)
alias(core.plugins.kotlin.serialization)
}
Expand Down
2 changes: 1 addition & 1 deletion KSuite/KSuitePro/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
plugins {
alias(core.plugins.infomaniak.android.library.flavor.aware)
alias(core.plugins.compose.compiler)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
alias(core.plugins.kotlin.serialization)
alias(core.plugins.navigation.safeargs)
}
Expand Down
2 changes: 1 addition & 1 deletion KSuite/MyKSuite/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
alias(core.plugins.infomaniak.android.library.flavor.aware)
alias(core.plugins.compose.compiler)
alias(core.plugins.ksp)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
alias(core.plugins.kotlin.serialization)
alias(core.plugins.navigation.safeargs)
}
Expand Down
3 changes: 0 additions & 3 deletions Legacy/Confetti/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
}

def legacyCompileSdk = rootProject.ext["legacyCompileSdk"]
Expand All @@ -20,8 +19,6 @@ android {
targetCompatibility javaVersion
}

kotlinOptions { jvmTarget = javaVersion }

dependencies {
implementation project(':Core:Legacy')
}
Expand Down
5 changes: 1 addition & 4 deletions Legacy/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-parcelize'
id 'kotlinx-serialization'
id 'com.google.devtools.ksp'
alias(core.plugins.navigation.safeargs)
}

rootProject.ext {
legacyCompileSdk = 35
legacyCompileSdk = 37
legacyMinSdk = 27
}

Expand Down Expand Up @@ -38,8 +37,6 @@ android {
viewBinding true
buildConfig true
}

kotlinOptions { jvmTarget = javaVersion }
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion Login/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
plugins {
alias(core.plugins.infomaniak.android.library)
alias(core.plugins.kotlin.serialization)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
}

android {
Expand Down
2 changes: 1 addition & 1 deletion Network/Models/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

plugins {
alias(core.plugins.infomaniak.android.library)
kotlin("plugin.parcelize")
alias(core.plugins.kotlin.parcelize)
alias(core.plugins.kotlin.serialization)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.infomaniak.core.compose.lint

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.Action
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
Expand All @@ -35,15 +36,20 @@ class ComposeLintPlugin : Plugin<Project> {

target.subprojects {
plugins.withId("com.android.base") {
extensions.configure<CommonExtension<*, *, *, *, *, *>>("android") {
lint {
lintConfig = rootProject.file("Core/lint.xml")
extensions.configure(
"android",
object : Action<CommonExtension> {
override fun execute(android: CommonExtension) {
android.lint.apply {
lintConfig = rootProject.file("Core/lint.xml")

// To updateLintBaseline correctly, temporarily uncomment this line to only include errors and not
// warnings in the generated baseline
// ignoreWarnings = true
}
}
// To updateLintBaseline correctly, temporarily uncomment this line to only include errors and not
// warnings in the generated baseline
// ignoreWarnings = true
}
}
},
)

dependencies {
add("lintChecks", lintLibrary)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,23 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {

override fun apply(target: Project): Unit = with(target) {
apply(plugin = "com.android.library")
apply(plugin = "org.jetbrains.kotlin.android")

val proguardRules = file("proguard-rules.pro")

android {
applyCommonConfiguration()
defaultConfig {
consumerProguardFile("proguard-rules.pro")
if (proguardRules.exists()) {
consumerProguardFile(proguardRules)
}
}
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
if (proguardRules.exists()) {
proguardFiles(proguardRules)
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions build-logic/convention/src/main/kotlin/AndroidModuleConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion

fun CommonExtension<*, *, *, *, *, *>.applyCommonConfiguration() {
compileSdk = 36
defaultConfig {
fun CommonExtension.applyCommonConfiguration() {
compileSdk = 37
defaultConfig.apply {
minSdk = 27
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
compileOptions.apply {
val javaVersion = JavaVersion.VERSION_11
targetCompatibility = javaVersion // Generated JVM bytecode
sourceCompatibility = javaVersion // Java language features. We are not writing Java, so we just keep it matching.
Expand Down
7 changes: 6 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@

import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

buildscript {
dependencies {
classpath(core.kotlin.gradle.plugin)
}
}

plugins {
alias(core.plugins.android.library) apply false
alias(core.plugins.kotlin.android) apply false
alias(core.plugins.ktlint)
alias(core.plugins.compose.lint)
}
Expand Down
17 changes: 9 additions & 8 deletions gradle/core.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
accompanistPermissions = "0.37.3"
activityCompose = "1.10.1" # TODO: Update to 1.11.0 or later after we bump compileSdk to 36
adaptive = "1.2.0"
agp = "8.13.2" # Delete this to-do on agp 9+ after searching and checking the project for the following: TODO[AGP9]
agp = "9.3.2"
androidLogin = "3.1.14"
androidxCollection = "1.5.0"
androidxCore = "1.16.0" # TODO: Update to 1.17.0 or later after we bump compileSdk to 36
Expand All @@ -25,18 +25,18 @@ espressoCore = "3.7.0"
firebaseMessaging = "24.1.2"
googleServices = "4.4.4"
gson = "2.13.2"
hiltAndroid = "2.58"
hiltAndroidx = "1.3.0"
hiltAndroid = "2.60.1"
hiltAndroidx = "1.4.0"
integrity = "1.6.0"
#noinspection NewerVersionAvailable
junit = "4.13" # Don't update this because it breaks tests
junitAndroidx = "1.3.0"
kotest = "6.0.7"
kotlinxCollectionsImmutable = "0.4.0"
kotlinxCoroutines = "1.10.2"
kotlinxCoroutines = "1.11.0"
kotlinxSerialization = "1.9.0"
kotlin = "2.3.21"
ksp = "2.3.9"
kotlin = "2.4.10"
ksp = "2.3.11"
ktlintPlugin = "14.0.1"
ktor = "3.5.0"
lifecycleRuntimeKtx = "2.10.0"
Expand All @@ -55,8 +55,8 @@ recyclerView = "1.4.0"
#noinspection NewerVersionAvailable
robolectric = "4.13" # Don't update this because it breaks tests
room = "2.8.4"
sentry = "8.27.1"
sentryPlugin = "5.12.2"
sentry = "8.53.0"
sentryPlugin = "6.19.0"
splitties = "3.0.0"
swipeRefreshLayout = "1.2.0"
workManager = "2.11.0"
Expand Down Expand Up @@ -194,6 +194,7 @@ ktor-client-encoding = { module = "io.ktor:ktor-client-encoding", version.ref =
ktor-client-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
dotlottie = { module = "com.github.lottiefiles:dotlottie-android", version.ref = "dotlottie" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 2 additions & 5 deletions gradlew

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

3 changes: 1 addition & 2 deletions gradlew.bat

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

Loading