From 613f2316e9f7a09033ca742975e0ab7f68bbd850 Mon Sep 17 00:00:00 2001 From: Lachlan McKee Date: Wed, 3 Aug 2022 16:24:51 +0100 Subject: [PATCH 1/2] Changed to Java 8 compatibility to fix build --- binder/build.gradle | 4 ++-- mvicore-debugdrawer/build.gradle | 4 ++-- mvicore-diff/build.gradle | 4 ++-- mvicore-plugin/common/build.gradle | 4 ++-- mvicore-plugin/middleware/build.gradle | 4 ++-- mvicore/build.gradle | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/binder/build.gradle b/binder/build.gradle index f5a03897..db964854 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -30,8 +30,8 @@ dependencies { testImplementation deps('org.mockito.kotlin:mockito-kotlin') } -sourceCompatibility = "1.7" -targetCompatibility = "1.7" +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 task packageSources(type: Jar, dependsOn: 'classes') { classifier = 'sources' diff --git a/mvicore-debugdrawer/build.gradle b/mvicore-debugdrawer/build.gradle index 7be39a9c..4625c791 100644 --- a/mvicore-debugdrawer/build.gradle +++ b/mvicore-debugdrawer/build.gradle @@ -45,8 +45,8 @@ dependencies { implementation project(':mvicore') } -sourceCompatibility = "1.7" -targetCompatibility = "1.7" +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 buildscript { repositories { diff --git a/mvicore-diff/build.gradle b/mvicore-diff/build.gradle index 8f308233..8bde6a4a 100644 --- a/mvicore-diff/build.gradle +++ b/mvicore-diff/build.gradle @@ -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() diff --git a/mvicore-plugin/common/build.gradle b/mvicore-plugin/common/build.gradle index f29e23c8..db1ffd3d 100644 --- a/mvicore-plugin/common/build.gradle +++ b/mvicore-plugin/common/build.gradle @@ -34,8 +34,8 @@ artifacts { archives packageJavadoc } -sourceCompatibility = "1.8" -targetCompatibility = "1.8" +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 compileKotlin { kotlinOptions { diff --git a/mvicore-plugin/middleware/build.gradle b/mvicore-plugin/middleware/build.gradle index 9312ebba..1cbb1af6 100644 --- a/mvicore-plugin/middleware/build.gradle +++ b/mvicore-plugin/middleware/build.gradle @@ -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() diff --git a/mvicore/build.gradle b/mvicore/build.gradle index 50453ce5..2c85fe4a 100644 --- a/mvicore/build.gradle +++ b/mvicore/build.gradle @@ -18,8 +18,8 @@ dependencies { testImplementation deps('org.mockito.kotlin:mockito-kotlin') } -sourceCompatibility = "1.7" -targetCompatibility = "1.7" +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 buildscript { repositories { From 3421570f5ee4cff2533a865798323f026c6a3332 Mon Sep 17 00:00:00 2001 From: Lachlan McKee Date: Wed, 3 Aug 2022 17:21:56 +0100 Subject: [PATCH 2/2] Updated kotlin jvmTarget to target 1.8 --- binder/build.gradle | 6 ++++++ mvicore-android/build.gradle | 4 ++++ mvicore-debugdrawer/build.gradle | 12 +++++++++--- mvicore-demo/mvicore-demo-app/build.gradle | 4 ++++ mvicore-demo/mvicore-demo-catapi/build.gradle | 9 +++++++++ mvicore-demo/mvicore-demo-feature1/build.gradle | 9 +++++++++ mvicore-demo/mvicore-demo-feature2/build.gradle | 9 +++++++++ mvicore-diff/build.gradle | 4 ++-- mvicore-plugin/common/build.gradle | 4 ++-- mvicore-plugin/idea/build.gradle | 2 +- mvicore-plugin/middleware/build.gradle | 4 ++-- mvicore/build.gradle | 6 ++++++ 12 files changed, 63 insertions(+), 10 deletions(-) diff --git a/binder/build.gradle b/binder/build.gradle index db964854..b421ccf3 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -33,6 +33,12 @@ dependencies { 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' from sourceSets.main.allSource diff --git a/mvicore-android/build.gradle b/mvicore-android/build.gradle index 281dc76f..874b234a 100644 --- a/mvicore-android/build.gradle +++ b/mvicore-android/build.gradle @@ -26,6 +26,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/mvicore-debugdrawer/build.gradle b/mvicore-debugdrawer/build.gradle index 4625c791..29108e12 100644 --- a/mvicore-debugdrawer/build.gradle +++ b/mvicore-debugdrawer/build.gradle @@ -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 { @@ -45,9 +54,6 @@ dependencies { implementation project(':mvicore') } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - buildscript { repositories { jcenter() diff --git a/mvicore-demo/mvicore-demo-app/build.gradle b/mvicore-demo/mvicore-demo-app/build.gradle index 55457cf7..289dbba1 100644 --- a/mvicore-demo/mvicore-demo-app/build.gradle +++ b/mvicore-demo/mvicore-demo-app/build.gradle @@ -26,6 +26,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/mvicore-demo/mvicore-demo-catapi/build.gradle b/mvicore-demo/mvicore-demo-catapi/build.gradle index a8014119..78373c66 100644 --- a/mvicore-demo/mvicore-demo-catapi/build.gradle +++ b/mvicore-demo/mvicore-demo-catapi/build.gradle @@ -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 { diff --git a/mvicore-demo/mvicore-demo-feature1/build.gradle b/mvicore-demo/mvicore-demo-feature1/build.gradle index 62c88a62..5c639b50 100644 --- a/mvicore-demo/mvicore-demo-feature1/build.gradle +++ b/mvicore-demo/mvicore-demo-feature1/build.gradle @@ -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 { diff --git a/mvicore-demo/mvicore-demo-feature2/build.gradle b/mvicore-demo/mvicore-demo-feature2/build.gradle index 71a1e0c5..ce0050bf 100644 --- a/mvicore-demo/mvicore-demo-feature2/build.gradle +++ b/mvicore-demo/mvicore-demo-feature2/build.gradle @@ -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 { diff --git a/mvicore-diff/build.gradle b/mvicore-diff/build.gradle index 8bde6a4a..56cc9294 100644 --- a/mvicore-diff/build.gradle +++ b/mvicore-diff/build.gradle @@ -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 } } diff --git a/mvicore-plugin/common/build.gradle b/mvicore-plugin/common/build.gradle index db1ffd3d..8d1f62f6 100644 --- a/mvicore-plugin/common/build.gradle +++ b/mvicore-plugin/common/build.gradle @@ -39,11 +39,11 @@ 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 } } diff --git a/mvicore-plugin/idea/build.gradle b/mvicore-plugin/idea/build.gradle index b4bb5159..869c609b 100644 --- a/mvicore-plugin/idea/build.gradle +++ b/mvicore-plugin/idea/build.gradle @@ -49,7 +49,7 @@ task packageSources(type: Jar, dependsOn: 'classes') { compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_1_8 } } diff --git a/mvicore-plugin/middleware/build.gradle b/mvicore-plugin/middleware/build.gradle index 1cbb1af6..e23a9e4a 100644 --- a/mvicore-plugin/middleware/build.gradle +++ b/mvicore-plugin/middleware/build.gradle @@ -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 } } diff --git a/mvicore/build.gradle b/mvicore/build.gradle index 2c85fe4a..9865120d 100644 --- a/mvicore/build.gradle +++ b/mvicore/build.gradle @@ -21,6 +21,12 @@ dependencies { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 +compileKotlin { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } +} + buildscript { repositories { jcenter()