Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Changed to Java 8 compatibility to fix build #160

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

Merged
merged 2 commits into from
Aug 3, 2022
Merged

Changed to Java 8 compatibility to fix build #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
613f231
Changed to Java 8 compatibility to fix build
LachlanMcKee Aug 3, 2022
3421570
Updated kotlin jvmTarget to target 1.8
LachlanMcKee Aug 3, 2022
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
10 changes: 8 additions & 2 deletions binder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@ dependencies {
testImplementation deps('org.mockito.kotlin:mockito-kotlin')
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

compileKotlin {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

task packageSources(type: Jar, dependsOn: 'classes') {
classifier = 'sources'
Expand Down
4 changes: 4 additions & 0 deletions mvicore-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

dependencies {
Expand Down
12 changes: 9 additions & 3 deletions mvicore-debugdrawer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

dependencies {
Expand All @@ -45,9 +54,6 @@ dependencies {
implementation project(':mvicore')
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"

buildscript {
repositories {
jcenter()
Expand Down
4 changes: 4 additions & 0 deletions mvicore-demo/mvicore-demo-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

dependencies {
Expand Down
9 changes: 9 additions & 0 deletions mvicore-demo/mvicore-demo-catapi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

dependencies {
Expand Down
9 changes: 9 additions & 0 deletions mvicore-demo/mvicore-demo-feature1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

androidExtensions {
Expand Down
9 changes: 9 additions & 0 deletions mvicore-demo/mvicore-demo-feature2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

androidExtensions {
Expand Down
8 changes: 4 additions & 4 deletions mvicore-diff/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dependencies {
testImplementation deps('org.jetbrains.kotlin:kotlin-test-junit')
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

repositories {
jcenter()
Expand Down Expand Up @@ -52,11 +52,11 @@ artifacts {
}
compileKotlin {
kotlinOptions {
jvmTarget = "1.6"
jvmTarget = JavaVersion.VERSION_1_8
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.6"
jvmTarget = JavaVersion.VERSION_1_8
}
}
8 changes: 4 additions & 4 deletions mvicore-plugin/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ artifacts {
archives packageJavadoc
}

sourceCompatibility = "1.8"
targetCompatibility = "1.8"
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}
}
2 changes: 1 addition & 1 deletion mvicore-plugin/idea/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ task packageSources(type: Jar, dependsOn: 'classes') {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}
}

Expand Down
8 changes: 4 additions & 4 deletions mvicore-plugin/middleware/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
}

sourceCompatibility = "1.8"
targetCompatibility = "1.8"
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

repositories {
jcenter()
Expand Down Expand Up @@ -53,11 +53,11 @@ buildscript {
}
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}
}
10 changes: 8 additions & 2 deletions mvicore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ dependencies {
testImplementation deps('org.mockito.kotlin:mockito-kotlin')
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

compileKotlin {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

buildscript {
repositories {
Expand Down