Skip to content

Commit 5e0a8d0

Browse files
committed
Bump build tools versions
1 parent 849b23a commit 5e0a8d0

File tree

6 files changed

+29
-12
lines changed

6 files changed

+29
-12
lines changed

android/build.gradle

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ group 'org.sigrok.flutter_libserialport'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.5.20'
5+
ext.kotlin_version = '1.9.20'
66
repositories {
77
google()
88
jcenter()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.1.3'
12+
classpath 'com.android.tools.build:gradle:8.2.2'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
@@ -25,13 +25,14 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
compileSdkVersion 29
28+
compileSdkVersion 33
2929

3030
sourceSets {
3131
main.java.srcDirs += 'src/main/kotlin'
3232
}
3333
defaultConfig {
3434
minSdkVersion 16
35+
namespace 'org.sigrok.flutter_libserialport'
3536
}
3637
lintOptions {
3738
disable 'InvalidPackage'
@@ -41,6 +42,13 @@ android {
4142
path "libserialport/CMakeLists.txt"
4243
}
4344
}
45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_1_8
47+
targetCompatibility JavaVersion.VERSION_1_8
48+
}
49+
kotlinOptions {
50+
jvmTarget = '1.8'
51+
}
4452
}
4553

4654
dependencies {

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-6.7-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

example/android/app/build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 34
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +39,8 @@ android {
3939
defaultConfig {
4040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4141
applicationId "org.sigrok.flutter_libserialport_example"
42-
minSdkVersion 16
42+
namespace "org.sigrok.flutter_libserialport_example"
43+
minSdkVersion flutter.minSdkVersion
4344
targetSdkVersion 29
4445
versionCode flutterVersionCode.toInteger()
4546
versionName flutterVersionName
@@ -52,6 +53,15 @@ android {
5253
signingConfig signingConfigs.debug
5354
}
5455
}
56+
57+
compileOptions {
58+
sourceCompatibility JavaVersion.VERSION_1_8
59+
targetCompatibility JavaVersion.VERSION_1_8
60+
}
61+
62+
kotlinOptions {
63+
jvmTarget = '1.8'
64+
}
5565
}
5666

5767
flutter {

example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.9.20'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.0'
9+
classpath 'com.android.tools.build:gradle:8.2.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -26,6 +26,6 @@ subprojects {
2626
project.evaluationDependsOn(':app')
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_libserialport
22
description: A simple wrapper around libserialport utilizing Flutter's
33
build system to build and deploy the C-library for the target platform.
4-
version: 0.3.0
4+
version: 0.3.1
55
homepage: https://github.com/jpnurmi/flutter_libserialport
66
repository: https://github.com/jpnurmi/flutter_libserialport
77
issue_tracker: https://github.com/jpnurmi/flutter_libserialport/issues

0 commit comments

Comments
 (0)