Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update Core2 versions #212

Merged
merged 1 commit into from
Nov 27, 2024
Merged

chore: Update Core2 versions #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions Core2/Matomo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ plugins {
alias(libs.plugins.kotlin.android)
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.matomo"
compileSdk = 34
compileSdk = sharedCompileSdk

defaultConfig {
minSdk = 24
minSdk = sharedMinSdk

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -24,16 +28,16 @@ android {
}

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

buildFeatures {
buildConfig = true
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = sharedJavaVersion.toString()
}
}

Expand Down
14 changes: 9 additions & 5 deletions Core2/Network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ plugins {
alias(libs.plugins.kotlin.android)
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.network"
compileSdk = 34
compileSdk = sharedCompileSdk

defaultConfig {
minSdk = 24
minSdk = sharedMinSdk

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -21,11 +25,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = sharedJavaVersion
targetCompatibility = sharedJavaVersion
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = sharedJavaVersion.toString()
}
}

Expand Down
14 changes: 9 additions & 5 deletions Core2/Sentry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ plugins {
alias(libs.plugins.kotlin.android)
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.sentry"
compileSdk = 34
compileSdk = sharedCompileSdk

defaultConfig {
minSdk = 24
minSdk = sharedMinSdk

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -21,11 +25,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = sharedJavaVersion
targetCompatibility = sharedJavaVersion
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = sharedJavaVersion.toString()
}
}

Expand Down
14 changes: 9 additions & 5 deletions Core2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ plugins {
alias(libs.plugins.kotlin.android)
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.core2"
compileSdk = 34
compileSdk = sharedCompileSdk

defaultConfig {
minSdk = 24
minSdk = sharedMinSdk

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -21,11 +25,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = sharedJavaVersion
targetCompatibility = sharedJavaVersion
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = sharedJavaVersion.toString()
}
}

Expand Down
14 changes: 9 additions & 5 deletions FileTypes/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ plugins {
alias(libs.plugins.compose.compiler)
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.library.filetypes"
compileSdk = 34
compileSdk = sharedCompileSdk

defaultConfig {
minSdk = 24
minSdk = sharedMinSdk

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -22,11 +26,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = sharedJavaVersion
targetCompatibility = sharedJavaVersion
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = sharedJavaVersion.toString()
}
buildFeatures {
compose = true
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ plugins {
kotlin("plugin.serialization") version libs.versions.kotlin
}

val sharedCompileSdk: Int by rootProject.extra
val sharedMinSdk: Int by rootProject.extra
val sharedTargetSdk: Int by rootProject.extra
val javaVersion: JavaVersion by rootProject.extra
val sharedJavaVersion: JavaVersion by rootProject.extra

android {
namespace = "com.infomaniak.swisstransfer"
compileSdk = sharedTargetSdk
compileSdk = sharedCompileSdk

defaultConfig {
applicationId = "com.infomaniak.swisstransfer"
minSdk = sharedMinSdk
targetSdk = sharedTargetSdk
targetSdk = sharedCompileSdk
versionCode = 1 // 0_00_000_01 TODO: Update when released in prod
versionName = "0.0.1-Alpha1"

Expand All @@ -45,11 +45,11 @@ android {
}

compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
sourceCompatibility = sharedJavaVersion
targetCompatibility = sharedJavaVersion
}
kotlinOptions {
jvmTarget = javaVersion.toString()
jvmTarget = sharedJavaVersion.toString()
}
buildFeatures {
compose = true
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
extra.apply {
set("sharedTargetSdk", 35)
set("sharedCompileSdk", 35)
set("sharedMinSdk", 24)
set("javaVersion", JavaVersion.VERSION_17)
set("sharedJavaVersion", JavaVersion.VERSION_17)
}
}

Expand Down