Skip to content

Commit be7544d

Browse files
ABausGcs-nuuk
andcommitted
chore: update gradle and complieSdkVersion
Co-authored-by: ColinSchmale <cs@nuuk.de>
1 parent 1ed0666 commit be7544d

8 files changed

Lines changed: 32 additions & 10 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ jobs:
6969
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
7070
sudo udevadm control --reload-rules
7171
sudo udevadm trigger --name-match=kvm
72-
- name: Set up JDK 17
72+
- name: Set up JDK 21
7373
uses: actions/setup-java@v4
7474
with:
7575
distribution: 'temurin'
76-
java-version: '17'
76+
java-version: '21'
7777
- name: Run Android Integration Tests
7878
uses: reactivecircus/android-emulator-runner@v2
7979
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,4 @@ app.*.symbols
131131

132132
# don't check in golden failure output
133133
**/failures/*.png
134+
.cxx

packages/home_widget/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929
if (project.android.hasProperty("namespace")) {
3030
namespace 'es.antonborri.home_widget'
3131
}
32-
compileSdk 34
32+
compileSdk 35
3333

3434
sourceSets {
3535
main.java.srcDirs += 'src/main/kotlin'
@@ -51,5 +51,5 @@ android {
5151

5252
dependencies {
5353
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
54-
implementation 'androidx.glance:glance-appwidget:1.0.0'
54+
implementation "androidx.glance:glance-appwidget:1.+"
5555
}

packages/home_widget/example/android/app/build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,30 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
compileSdkVersion 34
26+
compileSdkVersion 35
27+
ndkVersion = "26.3.11579264"
2728

2829
sourceSets {
2930
main.java.srcDirs += 'src/main/kotlin'
3031
}
3132

33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_21
35+
targetCompatibility JavaVersion.VERSION_21
36+
}
37+
38+
kotlin {
39+
jvmToolchain(21)
40+
}
41+
3242
lintOptions {
3343
disable 'InvalidPackage'
3444
}
3545

3646
defaultConfig {
3747
applicationId "es.antonborri.home_widget_example"
3848
minSdkVersion 23
39-
targetSdkVersion 34
49+
targetSdkVersion 35
4050
multiDexEnabled true
4151
versionCode flutterVersionCode.toInteger()
4252
versionName flutterVersionName

packages/home_widget/example/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
22
android.enableR8=true
33
android.useAndroidX=true
44
android.enableJetifier=true
5+
android.defaults.buildfeatures.buildconfig=true
6+
android.nonTransitiveRClass=false
7+
android.nonFinalResIds=false
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Sat Nov 20 22:03:31 CET 2021
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

packages/home_widget/example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.4.2" apply false
21+
id "com.android.application" version '8.6.1' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
2323
}
2424

packages/home_widget/example/pubspec.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ publish_to: 'none'
66
environment:
77
sdk: ">=2.12.0 <4.0.0"
88

9+
dependency_overrides:
10+
workmanager:
11+
git:
12+
url: https://github.com/fluttercommunity/flutter_workmanager
13+
path: workmanager
14+
ref: d94eb34
15+
916
dependencies:
1017
flutter:
1118
sdk: flutter

0 commit comments

Comments
 (0)