Skip to content

Commit b92482a

Browse files
committed
fix: update flutter to 3.32.0
1 parent 2ab27bd commit b92482a

File tree

28 files changed

+1062
-1233
lines changed

28 files changed

+1062
-1233
lines changed

.fvmrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"flutter": "3.32.0"
3+
}

.github/actions/dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
- name: Install Flutter
3737
uses: subosito/flutter-action@v2
3838
with:
39-
flutter-version: '3.24.5'
39+
flutter-version: '3.32.0'
4040

4141
# Get package dependencies for dapp and generate files
4242
- name: Get package dependencies for dapp and generate files
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Build and Release
2+
3+
on:
4+
push:
5+
branches: [ "develop" ]
6+
7+
permissions:
8+
contents: write
9+
packages: write
10+
11+
jobs:
12+
build-android:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Unshallow repository
20+
run: |
21+
git fetch --unshallow
22+
git fetch -a
23+
24+
- name: Set up Flutter
25+
uses: subosito/flutter-action@v2
26+
with:
27+
flutter-version: '3.32.0'
28+
29+
- name: Generate all
30+
run: |
31+
./scripts/generate_all.sh
32+
33+
- name: Setup rust
34+
run: |
35+
rustup target add armv7-linux-androideabi
36+
rustup target add aarch64-linux-android
37+
rustup target add x86_64-linux-android
38+
39+
- name: Build native dependencies
40+
run: |
41+
./scripts/build_native_deps.sh
42+
43+
- name: Get version tag
44+
id: get_version
45+
run: |
46+
git fetch -a
47+
LATEST_TAG=$(git tag -l "v*.*.*" | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" | sort -V | tail -n1)
48+
49+
if [ -z "$LATEST_TAG" ]; then
50+
VERSION="v0.0.1"
51+
else
52+
COMMIT_COUNT=$(git rev-list ${LATEST_TAG}..HEAD --count)
53+
54+
if [ "$COMMIT_COUNT" = "0" ]; then
55+
VERSION="$LATEST_TAG"
56+
else
57+
BASE_VERSION=${LATEST_TAG#v}
58+
IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
59+
60+
NEW_PATCH=$((PATCH + COMMIT_COUNT))
61+
VERSION="v${MAJOR}.${MINOR}.${NEW_PATCH}"
62+
fi
63+
fi
64+
65+
echo "version=$VERSION" >> $GITHUB_OUTPUT
66+
67+
if git describe --exact-match --tags HEAD >/dev/null 2>&1; then
68+
echo "is_prerelease=false" >> $GITHUB_OUTPUT
69+
echo "release_name=Release $VERSION" >> $GITHUB_OUTPUT
70+
else
71+
echo "is_prerelease=true" >> $GITHUB_OUTPUT
72+
echo "release_name=Pre-release $VERSION" >> $GITHUB_OUTPUT
73+
fi
74+
75+
- name: Free storage
76+
run: |
77+
rm -rf scripts/yttrium
78+
- name: Create tarball
79+
run: |
80+
tar -czf ../reown_flutter-${{ steps.get_version.outputs.version }}.tar.gz \
81+
--exclude='.git' \
82+
--exclude='.dart_tool' \
83+
--exclude='.fvm' \
84+
--exclude='build' \
85+
.
86+
mv ../reown_flutter-${{ steps.get_version.outputs.version }}.tar.gz .
87+
88+
- name: Create Release
89+
if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
90+
uses: softprops/action-gh-release@v1
91+
with:
92+
tag_name: ${{ steps.get_version.outputs.version }}
93+
name: ${{ steps.get_version.outputs.release_name }}
94+
prerelease: ${{ steps.get_version.outputs.is_prerelease }}
95+
files: reown_flutter-${{ steps.get_version.outputs.version }}.tar.gz
96+
generate_release_notes: true
97+
body: |
98+
## Reown Flutter
99+
100+
This .tar.gz contains Reown Flutter SDK with prebuilt dependencies intended to be used on CI/CD pipelines.
101+
102+
env:
103+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-packages.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if: github.event.inputs.core == 'true'
7979
uses: subosito/flutter-action@v2
8080
with:
81-
flutter-version: '3.24.5'
81+
flutter-version: '3.32.0'
8282

8383
- name: Install yq
8484
if: github.event.inputs.core == 'true'
@@ -162,7 +162,7 @@ jobs:
162162
if: github.event.inputs.sign == 'true'
163163
uses: subosito/flutter-action@v2
164164
with:
165-
flutter-version: '3.24.5'
165+
flutter-version: '3.32.0'
166166

167167
- name: Install yq
168168
if: github.event.inputs.sign == 'true'
@@ -269,7 +269,7 @@ jobs:
269269
if: github.event.inputs.appkit == 'true'
270270
uses: subosito/flutter-action@v2
271271
with:
272-
flutter-version: '3.24.5'
272+
flutter-version: '3.32.0'
273273

274274
- name: Install yq
275275
if: github.event.inputs.appkit == 'true'
@@ -381,7 +381,7 @@ jobs:
381381
if: github.event.inputs.walletkit == 'true'
382382
uses: subosito/flutter-action@v2
383383
with:
384-
flutter-version: '3.24.5'
384+
flutter-version: '3.32.0'
385385

386386
- name: Install yq
387387
if: github.event.inputs.walletkit == 'true'
@@ -497,7 +497,7 @@ jobs:
497497
if: github.event.inputs.yttrium == 'true'
498498
uses: subosito/flutter-action@v2
499499
with:
500-
flutter-version: '3.24.5'
500+
flutter-version: '3.32.0'
501501

502502
- name: Get package version from reown_yttrium/pubspec.yaml
503503
if: github.event.inputs.yttrium == 'true'
@@ -576,7 +576,7 @@ jobs:
576576
if: github.event.inputs.cli == 'true'
577577
uses: subosito/flutter-action@v2
578578
with:
579-
flutter-version: '3.24.5'
579+
flutter-version: '3.32.0'
580580

581581
- name: Get package version from reown_cli/pubspec.yaml
582582
if: github.event.inputs.cli == 'true'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ app.*.map.json
5656
# Run scripts
5757
run_tests_all.sh
5858
*.env.secret*
59+
60+
scripts/yttrium
61+
libuniffi_yttrium.so

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# **Reown - Flutter**
22

3+
> NOTE: This is not official package, this package forked before the license change and therefore remains free to use. If you want to use reown's official package go to [reown-com/reown_flutter](https://github.com/reown-com/reown_flutter).
4+
35
The communications protocol for web3, Reown brings the ecosystem together by enabling hundreds of wallets and apps to securely connect and interact. This repository contains Flutter implementation of WalletConnect protocol for Flutter applications.
46

57
## Published SDKs

packages/reown_appkit/example/base/android/app/build.gradle

Lines changed: 8 additions & 11 deletions
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'
@@ -27,14 +28,10 @@ if (keystorePropertiesFile.exists()) {
2728
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
2829
}
2930

30-
apply plugin: 'com.android.application'
31-
apply plugin: 'kotlin-android'
32-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
33-
3431
android {
3532
namespace "com.walletconnect.flutterdapp"
3633
compileSdkVersion flutter.compileSdkVersion
37-
ndkVersion = "27.0.12077973"
34+
ndkVersion = "27.3.13750724"
3835

3936
compileOptions {
4037
sourceCompatibility JavaVersion.VERSION_1_8
@@ -111,5 +108,5 @@ flutter {
111108
}
112109

113110
dependencies {
114-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
111+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21"
115112
}

packages/reown_appkit/example/base/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '2.0.21'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.7.3'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

packages/reown_appkit/example/base/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
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" // apply true
21+
id "com.android.application" version "8.9.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.0.21" apply false
23+
}
24+
25+
include ":app"

0 commit comments

Comments
 (0)