Skip to content

Commit 2a82cb0

Browse files
committed
Bump min flutter version to 3.27.0, AGP to 8.5.2.
1 parent b46630e commit 2a82cb0

File tree

9 files changed

+68
-73
lines changed

9 files changed

+68
-73
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ gradlew
4747
gradlew.bat
4848
local.properties
4949
**/GeneratedPluginRegistrant.java
50+
**/.cxx/
5051

5152
# Android Studio will place build artifacts here
5253
**/android/app/debug

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.0.7
2+
3+
* Bump min flutter version to 3.27.0, AGP to 8.5.2.
4+
15
## 0.0.6
26

37
* Add support for SwiftPM.

android/build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
group 'com.ryanheise.just_waveform'
2-
version '1.0'
1+
group "com.ryanheise.just_waveform"
2+
version "1.0"
33

44
buildscript {
5+
ext {
6+
agp_version = '8.5.2'
7+
}
58
repositories {
69
google()
710
mavenCentral()
811
}
912

1013
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.3.0'
14+
classpath "com.android.tools.build:gradle:$agp_version"
1215
}
1316
}
1417

@@ -22,18 +25,16 @@ rootProject.allprojects {
2225
apply plugin: 'com.android.library'
2326

2427
android {
25-
// Conditional for compatibility with AGP <4.2.
26-
if (project.android.hasProperty("namespace")) {
27-
namespace 'com.ryanheise.just_waveform'
28-
}
29-
compileSdkVersion 33
28+
namespace "com.ryanheise.just_waveform"
29+
30+
compileSdk = 35
3031

3132
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
33+
sourceCompatibility = JavaVersion.VERSION_11
34+
targetCompatibility = JavaVersion.VERSION_11
3435
}
3536

3637
defaultConfig {
37-
minSdkVersion 16
38+
minSdk = 16
3839
}
3940
}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Mar 29 23:31:06 AEDT 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
35
zipStoreBase=GRADLE_USER_HOME
46
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

example/android/app/build.gradle

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,26 @@
1-
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
3-
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
5-
localProperties.load(reader)
6-
}
7-
}
8-
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-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
15-
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
17-
}
18-
19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
20-
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id "dev.flutter.flutter-gradle-plugin"
226
}
237

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
278
android {
289
namespace 'com.ryanheise.just_waveform_example'
29-
compileSdkVersion 33
10+
compileSdk flutter.compileSdkVersion
3011

3112
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
13+
sourceCompatibility = JavaVersion.VERSION_11
14+
targetCompatibility = JavaVersion.VERSION_11
3415
}
3516

3617
defaultConfig {
3718
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3819
applicationId "com.ryanheise.just_waveform_example"
39-
minSdkVersion 16
40-
targetSdkVersion 31
41-
versionCode flutterVersionCode.toInteger()
42-
versionName flutterVersionName
20+
minSdk flutter.minSdkVersion
21+
targetSdk flutter.targetSdkVersion
22+
versionCode flutter.versionCode
23+
versionName flutter.versionName
4324
}
4425

4526
buildTypes {

example/android/build.gradle

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,9 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.3.0'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()
154
mavenCentral()
165
}
176

18-
gradle.projectsEvaluated{
19-
tasks.withType(JavaCompile) {
20-
options.compilerArgs << "-Xlint:deprecation"
21-
options.compilerArgs << "-Xlint:unchecked"
22-
}
23-
}
247
}
258

269
rootProject.buildDir = '../build'
@@ -32,3 +15,13 @@ subprojects {
3215
tasks.register("clean", Delete) {
3316
delete rootProject.buildDir
3417
}
18+
19+
gradle.projectsEvaluated {
20+
project(":just_waveform") {
21+
tasks.withType(JavaCompile) {
22+
options.compilerArgs << "-Werror"
23+
options.compilerArgs << "-Xlint:deprecation"
24+
options.compilerArgs << "-Xlint:unchecked"
25+
}
26+
}
27+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Sat Mar 29 23:32:42 AEDT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
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.5.2" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
23+
}
24+
25+
include ":app"

pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: just_waveform
22
description: Extracts waveform data from an audio file suitable for visually rendering the waveform.
3-
version: 0.0.6
3+
version: 0.0.7
44
homepage: https://github.com/ryanheise/just_waveform
55
topics:
66
- audio
77
- waveform
88

99
environment:
10-
sdk: ">=3.0.0 <4.0.0"
11-
flutter: ">=3.10.0"
10+
sdk: ^3.6.0
11+
flutter: ">=3.27.0"
1212

1313
dependencies:
1414
flutter:

0 commit comments

Comments
 (0)