Skip to content
Draft
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
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
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 @@ -33,15 +33,22 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
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
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
# Retain the existing Kotlin Gradle Plugin integration while migrating the build to AGP 9.
android.newDsl=false
android.builtInKotlin=false
4 changes: 2 additions & 2 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.1.1"
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,7 +25,7 @@ espressoCore = "3.7.0"
firebaseMessaging = "24.1.2"
googleServices = "4.4.4"
gson = "2.13.2"
hiltAndroid = "2.58"
hiltAndroid = "2.60.1"
hiltAndroidx = "1.3.0"
integrity = "1.6.0"
#noinspection NewerVersionAvailable
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.3.1-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