diff --git a/android/build.gradle b/android/build.gradle index 61fb0f9..5a87672 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,20 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + if (project.android.hasProperty('namespace')) { + namespace 'com.byneapp.flutter_config' + } + + compileSdkVersion 30 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/android/dotenv.gradle b/android/dotenv.gradle index 6d0e963..f75a358 100644 --- a/android/dotenv.gradle +++ b/android/dotenv.gradle @@ -69,6 +69,10 @@ def loadDotEnv(flavor = getCurrentFlavor()) { loadDotEnv() android { + if (project.android.hasProperty('namespace')) { + namespace 'com.byneapp.flutter_config' + } + defaultConfig { project.env.each { k, v -> def escaped = v.replaceAll("%", "\\\\u0025") diff --git a/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt b/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt index 2df6d05..af6111b 100644 --- a/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt +++ b/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt @@ -10,7 +10,6 @@ import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel.MethodCallHandler import io.flutter.plugin.common.MethodChannel.Result -import io.flutter.plugin.common.PluginRegistry.Registrar import java.lang.IllegalArgumentException import java.lang.reflect.Field @@ -31,14 +30,6 @@ class FlutterConfigPlugin(private val context: Context? = null): FlutterPlugin, applicationContext = null } - companion object { - @JvmStatic - fun registerWith(registrar: Registrar) { - val channel = MethodChannel(registrar.messenger(), "flutter_config") - channel.setMethodCallHandler(FlutterConfigPlugin(registrar.activity())) - } - } - override fun onMethodCall(call: MethodCall, result: Result) { if (call.method == "loadEnvVariables") { val variables = loadEnvVariables()