Skip to content

Commit 7b5d74e

Browse files
authored
Merge pull request #116 from fluttercommunity/update-tooling
Update tooling
2 parents 0b7ac47 + 50d8761 commit 7b5d74e

File tree

8 files changed

+24
-15
lines changed

8 files changed

+24
-15
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.5.0
2+
3+
* Breaking: Flutter SDK constraint is now >=3.10.0 (Dart 3-only). Apps on older Flutter versions can’t upgrade.
4+
* Update Android tooling
5+
16
## 0.4.1
27

38
* Maintenance release

android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ group = "dev.fluttercommunity.android_id"
22
version = "1.0-SNAPSHOT"
33

44
buildscript {
5-
ext.kotlin_version = "2.0.0"
5+
ext.kotlin_version = "2.1.0"
66
repositories {
77
google()
88
mavenCentral()
99
}
1010

1111
dependencies {
12-
classpath("com.android.tools.build:gradle:8.1.4")
12+
classpath("com.android.tools.build:gradle:8.7.2")
1313
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1414
}
1515
}
@@ -29,7 +29,7 @@ android {
2929
namespace = "dev.fluttercommunity.android_id"
3030
}
3131

32-
compileSdk = 34
32+
compileSdk = flutter.compileSdkVersion
3333

3434
compileOptions {
3535
sourceCompatibility = JavaVersion.VERSION_17
@@ -46,12 +46,12 @@ android {
4646
}
4747

4848
defaultConfig {
49-
minSdk = 21
49+
minSdk = flutter.minSdkVersion
5050
}
5151

5252
dependencies {
5353
testImplementation("org.jetbrains.kotlin:kotlin-test")
54-
testImplementation("org.mockito:mockito-core:5.12.0")
54+
testImplementation("org.mockito:mockito-core:5.20.0")
5555
}
5656

5757
testOptions {

example/android/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ android {
3333
targetCompatibility = JavaVersion.VERSION_17
3434
}
3535

36+
kotlinOptions {
37+
jvmTarget = "17"
38+
}
39+
3640
defaultConfig {
3741
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3842
applicationId = "dev.fluttercommunity.android_id_example"

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip

example/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.1.4" apply false
22-
id "org.jetbrains.kotlin.android" version "2.0.0" apply false
21+
id "com.android.application" version "8.7.2" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2323
}
2424

2525
include ":app"

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
path: ".."
88
relative: true
99
source: path
10-
version: "0.4.1"
10+
version: "0.5.0"
1111
async:
1212
dependency: transitive
1313
description:

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Demonstrates how to use the android_id plugin.
44
publish_to: 'none'
55

66
environment:
7-
sdk: '>=2.12.0'
7+
sdk: '>=3.0.0 <4.0.0'
88

99
dependencies:
1010
flutter:

pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: android_id
2-
description: A Flutter plugin for getting the Android ID. Only for Android.
32

3+
description: A Flutter plugin for getting the Android ID. Only for Android.
44
repository: https://github.com/fluttercommunity/android_id
55
issue_tracker: https://github.com/fluttercommunity/android_id/issues
66

@@ -13,18 +13,18 @@ topics:
1313
- android
1414
- native
1515

16-
version: 0.4.1
16+
version: 0.5.0
1717

1818
environment:
19-
sdk: '>=2.12.0 <4.0.0'
20-
flutter: '>=2.0.0'
19+
sdk: '>=3.0.0 <4.0.0'
20+
flutter: '>=3.10.0'
2121

2222
dependencies:
2323
flutter:
2424
sdk: flutter
2525

2626
dev_dependencies:
27-
flutter_lints: ">=2.0.0 <7.0.0"
27+
flutter_lints: ^6.0.0
2828
flutter_test:
2929
sdk: flutter
3030

0 commit comments

Comments
 (0)