Skip to content

Commit a04c1a9

Browse files
author
danny
committed
Fixed deprecated features in build
1 parent 3bef82a commit a04c1a9

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

macless_haystack/android/app/build.gradle

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
16
def localProperties = new Properties()
27
def localPropertiesFile = rootProject.file('local.properties')
38
if (localPropertiesFile.exists()) {
@@ -6,10 +11,6 @@ if (localPropertiesFile.exists()) {
611
}
712
}
813

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
1314

1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
@@ -21,9 +22,6 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2725

2826
android {
2927
defaultConfig {
@@ -76,5 +74,5 @@ flutter {
7674
}
7775

7876
dependencies {
79-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
77+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21"
8078
}

macless_haystack/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.8.21'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.6.1'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
include ':app'
2-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
3-
def properties = new Properties()
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
49

5-
assert localPropertiesFile.exists()
6-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
711

8-
def flutterSdkPath = properties.getProperty("flutter.sdk")
9-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
10-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.6.1" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.21" apply false
23+
}
24+
25+
include ":app"

0 commit comments

Comments
 (0)