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

Jump to bottom

Do not require Java 17 #369

Closed
wants to merge 3 commits into from
Closed

Do not require Java 17 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cac667
Do not require Java 17
findjigar Sep 22, 2023
c177286
Same for extension modules as well
findjigar Sep 22, 2023
fc20035
Undo version bump so CI builds
findjigar Sep 22, 2023
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
9 changes: 5 additions & 4 deletions extensions/kermit-bugsnag/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ kotlin {
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

sourceSets {
Expand All @@ -39,8 +44,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
9 changes: 5 additions & 4 deletions extensions/kermit-crashlytics/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ kotlin {
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

sourceSets {
Expand All @@ -40,8 +45,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
9 changes: 5 additions & 4 deletions extensions/kermit-koin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ kotlin {
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
jvm()
js {
Expand Down Expand Up @@ -66,8 +71,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
10 changes: 6 additions & 4 deletions kermit-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ plugins {
}

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
jvm()
js {
Expand Down Expand Up @@ -147,8 +153,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
1 change: 1 addition & 0 deletions kermit-simple/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ plugins {
}

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
js {
browser()
Expand Down
10 changes: 6 additions & 4 deletions kermit-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ plugins {
}

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
jvm()
js {
Expand Down Expand Up @@ -68,8 +74,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
10 changes: 6 additions & 4 deletions kermit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ plugins {
}

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
jvm()
js {
Expand Down Expand Up @@ -116,8 +122,4 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
9 changes: 4 additions & 5 deletions samples/sample-production/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ android {
versionCode = 1
versionName = "0.0.1"
}
packagingOptions {
exclude("META-INF/*.kotlin_module")
packaging {
resources.excludes.add("META-INF/*.kotlin_module")
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
viewBinding = true
Expand Down
1 change: 1 addition & 0 deletions samples/sample-production/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.bugsnag.gradle.plugin) apply false
id("co.touchlab.crashkios.bugsnaglink") version libs.versions.crashkios.get() apply false
}

allprojects {
Expand Down
15 changes: 9 additions & 6 deletions samples/sample-production/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,30 @@ plugins {
id("com.android.library")
kotlin("multiplatform")
kotlin("native.cocoapods")
}
id("co.touchlab.crashkios.bugsnaglink")}

android {
namespace = "co.touchlab.kermitsample"
compileSdk = libs.versions.compileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

val KERMIT_VERSION: String by project

version = "0.0.1"

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
androidTarget()
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
ios()
iosSimulatorArm64()

Expand Down
5 changes: 2 additions & 3 deletions samples/sample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ android {
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
viewBinding = true
Expand Down
13 changes: 8 additions & 5 deletions samples/sample/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,22 @@ android {
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

val KERMIT_VERSION: String by project

version = "0.0.1"

kotlin {
@Suppress("OPT_IN_USAGE")
targetHierarchy.default()
androidTarget()
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
ios()
iosSimulatorArm64()
js {
Expand Down
Loading