Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ build/
linked_*.ds
unlinked.ds
unlinked_spec.ds
pubspec.lock

# Android related
**/android/**/gradle-wrapper.jar
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.8.8
- Upgrade Flutter SDK, Gradle wrapper, and Android build toolchain to avoid incompatibility with Kotlin Gradle Plugin usage with Flutter 3.44

# 0.8.7
Fix performance issue in toUTF8 method

Expand Down
15 changes: 10 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,12 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 34

namespace "io.abner.flutter_js"

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

// //quickjs C build disabled for now - crashing with SEGV_MAPERR on ARM based devices
// externalNativeBuild {
// // Encapsulates your CMake build configurations.
Expand All @@ -58,6 +53,16 @@ android {
lintOptions {
disable 'InvalidPackage'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 07 13:01:34 IST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
229 changes: 0 additions & 229 deletions pubspec.lock

This file was deleted.

4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: flutter_js
description: A Javascript engine to use with flutter.
It uses Quickjs on Android and JavascriptCore on IOS
version: 0.8.7
version: 0.8.8
homepage: https://github.com/abner/flutter_js
repository: https://github.com/abner/flutter_js

environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.0.0"
flutter: ">=3.24.0"
dependencies:
flutter:
sdk: flutter
Expand Down