Skip to content

Commit 07a0a51

Browse files
committed
bump gradle pluging and kotlin version
1 parent d4971af commit 07a0a51

File tree

3 files changed

+43
-32
lines changed

3 files changed

+43
-32
lines changed

app/android/app/build.gradle

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

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-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,12 +22,9 @@ 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"
27-
2825
android {
29-
compileSdkVersion 34
26+
namespace "org.encointer.wallet"
27+
compileSdk flutter.compileSdkVersion
3028
ndkVersion flutter.ndkVersion
3129

3230
compileOptions {
@@ -100,7 +98,6 @@ flutter {
10098
}
10199

102100
dependencies {
103-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
104101
implementation 'com.jakewharton.threetenabp:threetenabp:1.4.6'
105102
// Fixes bug for newer ( > API 26) android versions
106103
// Bug: Failed to transform window-java-1.0.0-beta04.jar (androidx.window:window-java:1.0.0-beta04)

app/android/build.gradle

+13-13
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.0.0"
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
@@ -22,6 +9,19 @@ rootProject.buildDir = '../build'
229
subprojects {
2310
project.buildDir = "${rootProject.buildDir}/${project.name}"
2411
}
12+
13+
subprojects {
14+
afterEvaluate { project ->
15+
if (project.hasProperty('android')) {
16+
project.android {
17+
if (namespace == null) {
18+
namespace project.group
19+
}
20+
}
21+
}
22+
}
23+
}
24+
2525
subprojects {
2626
project.evaluationDependsOn(':app')
2727
}

app/android/settings.gradle

+22-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
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+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.3.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23+
}
24+
25+
include ":app"

0 commit comments

Comments
 (0)