diff --git a/packages/network_info_plus/network_info_plus/android/build.gradle b/packages/network_info_plus/network_info_plus/android/build.gradle deleted file mode 100644 index 3158a6c6ab..0000000000 --- a/packages/network_info_plus/network_info_plus/android/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -group 'dev.fluttercommunity.plus.network_info' -version '1.0-SNAPSHOT' - -buildscript { - ext.kotlin_version = '2.2.0' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -rootProject.allprojects { - repositories { - google() - mavenCentral() - } -} - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - namespace 'dev.fluttercommunity.plus.network_info' - compileSdk = flutter.compileSdkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - kotlinOptions { - jvmTarget = 17 - } - - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - lintOptions { - disable 'InvalidPackage' - } - - dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - } -} diff --git a/packages/network_info_plus/network_info_plus/android/build.gradle.kts b/packages/network_info_plus/network_info_plus/android/build.gradle.kts new file mode 100644 index 0000000000..95ef1015e7 --- /dev/null +++ b/packages/network_info_plus/network_info_plus/android/build.gradle.kts @@ -0,0 +1,53 @@ +group = "dev.fluttercommunity.plus.network_info" +version = "1.0-SNAPSHOT" + +buildscript { + val kotlinVersion = "2.2.0" + + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("com.android.tools.build:gradle:8.12.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +plugins { + id("com.android.library") + id("kotlin-android") +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +android { + namespace = "dev.fluttercommunity.plus.network_info" + compileSdk = flutter.compileSdkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + minSdk = 19 + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + lint { + disable.add("InvalidPackage") + } +} diff --git a/packages/network_info_plus/network_info_plus/android/settings.gradle b/packages/network_info_plus/network_info_plus/android/settings.gradle deleted file mode 100644 index 835a425131..0000000000 --- a/packages/network_info_plus/network_info_plus/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'network_info_plus' diff --git a/packages/network_info_plus/network_info_plus/android/settings.gradle.kts b/packages/network_info_plus/network_info_plus/android/settings.gradle.kts new file mode 100644 index 0000000000..7c4851832c --- /dev/null +++ b/packages/network_info_plus/network_info_plus/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "network_info_plus" diff --git a/packages/network_info_plus/network_info_plus/example/android/app/build.gradle b/packages/network_info_plus/network_info_plus/example/android/app/build.gradle deleted file mode 100644 index 05c9dc00be..0000000000 --- a/packages/network_info_plus/network_info_plus/example/android/app/build.gradle +++ /dev/null @@ -1,66 +0,0 @@ -plugins { - id "com.android.application" - id "dev.flutter.flutter-gradle-plugin" -} - -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -android { - compileSdk = flutter.compileSdkVersion - - namespace 'dev.fluttercommunity.plus.network_info_plus_example' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - applicationId "dev.fluttercommunity.plus.network_info_plus_example" - minSdk flutter.minSdkVersion - targetSdk flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.6.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' -} diff --git a/packages/network_info_plus/network_info_plus/example/android/app/build.gradle.kts b/packages/network_info_plus/network_info_plus/example/android/app/build.gradle.kts new file mode 100644 index 0000000000..60a90cf95d --- /dev/null +++ b/packages/network_info_plus/network_info_plus/example/android/app/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("com.android.application") + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "dev.fluttercommunity.plus.network_info_plus_example" + compileSdk = flutter.compileSdkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + applicationId = "dev.fluttercommunity.plus.network_info_plus_example" + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + lint { + disable.add("InvalidPackage") + } + + buildTypes { + release { + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} + +dependencies { + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test:runner:1.2.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0") +} diff --git a/packages/network_info_plus/network_info_plus/example/android/build.gradle b/packages/network_info_plus/network_info_plus/example/android/build.gradle deleted file mode 100644 index bc157bd1a1..0000000000 --- a/packages/network_info_plus/network_info_plus/example/android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/packages/network_info_plus/network_info_plus/example/android/build.gradle.kts b/packages/network_info_plus/network_info_plus/example/android/build.gradle.kts new file mode 100644 index 0000000000..0ca7f57c1a --- /dev/null +++ b/packages/network_info_plus/network_info_plus/example/android/build.gradle.kts @@ -0,0 +1,25 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubProjectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubProjectBuildDir) +} + +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/packages/network_info_plus/network_info_plus/example/android/settings.gradle b/packages/network_info_plus/network_info_plus/example/android/settings.gradle deleted file mode 100644 index f1c2904d82..0000000000 --- a/packages/network_info_plus/network_info_plus/example/android/settings.gradle +++ /dev/null @@ -1,25 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.12.1" apply false - id "org.jetbrains.kotlin.android" version "2.2.0" apply false -} - -include ":app" diff --git a/packages/network_info_plus/network_info_plus/example/android/settings.gradle.kts b/packages/network_info_plus/network_info_plus/example/android/settings.gradle.kts new file mode 100644 index 0000000000..388d07202a --- /dev/null +++ b/packages/network_info_plus/network_info_plus/example/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.12.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.0" apply false +} + +include(":app")