Skip to content
Merged
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
4 changes: 2 additions & 2 deletions mobile-app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

buildscript {
ext.kotlin_version = '2.2.0'
ext.kotlin_version = '2.3.21'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath 'com.android.tools.build:gradle:9.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
10 changes: 8 additions & 2 deletions mobile-app/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ android.nonTransitiveRClass=true
android.nonFinalResIds=true
# Disabled due to incompatibility with Flutter task and Cargokit plugin
org.gradle.configuration-cache=false
# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
android.defaults.buildfeatures.resvalues=true
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.enableAppCompileTimeRClass=false
android.usesSdkInManifest.disallowed=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
6 changes: 3 additions & 3 deletions mobile-app/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.13.2' apply false
id "com.android.application" version '9.2.0' apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
id "com.google.gms.google-services" version "4.4.4" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
id "org.jetbrains.kotlin.android" version "2.3.21" apply false
}

include ":app"
13 changes: 9 additions & 4 deletions quantus_sdk/rust_builder/cargokit/gradle/plugin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin

import java.nio.file.Paths
import javax.inject.Inject
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.process.ExecOperations

CargoKitPlugin.file = buildscript.sourceFile

Expand Down Expand Up @@ -42,6 +44,9 @@ abstract class CargoKitBuildTask extends DefaultTask {
@Input
List<String> targetPlatforms

@Inject
abstract ExecOperations getExecOperations()

@TaskAction
def build() {
if (project.cargokit.manifestDir == null) {
Expand All @@ -58,14 +63,14 @@ abstract class CargoKitBuildTask extends DefaultTask {
def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir)

def rootProjectDir = project.rootProject.projectDir

if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
project.exec {
execOperations.exec {
commandLine 'chmod', '+x', path
}
}
project.exec {

execOperations.exec {
executable path
args "build-gradle"
environment "CARGOKIT_ROOT_PROJECT_DIR", rootProjectDir
Expand Down
Loading