fix(android): fix support for Java 8 in Kotlin

tidev · Jan 23, 2020 · 2287e83 · 2287e83
1 parent 5ce5e72
commit 2287e83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/android/templates/build/app.build.gradle b/android/templates/build/app.build.gradle
@@ -29,7 +29,6 @@ android {
 		}
 <% } %>
 	}
-	// TODO: Add Java 8 support in the future.
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8

diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
@@ -120,7 +120,7 @@ android {
 			}
 		}
 	}
-	// TODO: Add Java 8 support in the future.
+
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
@@ -131,6 +131,10 @@ android {
 		exclude '/lib/**/libc++_shared.so'
 		exclude '/lib/**/libkroll-v8.so'
 	}
+	// Sets the JVM target in order to allow usage of Java 8 features in Kotlin native modules.
+	kotlinOptions {
+		jvmTarget = '1.8'
+	}
 }
 
 tasks.withType(JavaCompile) {

diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
@@ -103,7 +103,6 @@ android {
 			]
 		}
 	}
-	// TODO: Add Java 8 support in the future.
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8