Skip to content

Commit 060efff

Browse files
committed
git tag v1.0.5+60
1 parent e12c353 commit 060efff

File tree

4 files changed

+40
-63
lines changed

4 files changed

+40
-63
lines changed

example/android/app/build.gradle

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,44 @@
11
plugins {
22
id "com.android.application"
33
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
45
id "dev.flutter.flutter-gradle-plugin"
56
}
67

7-
def localProperties = new Properties()
8-
def localPropertiesFile = rootProject.file('local.properties')
9-
if (localPropertiesFile.exists()) {
10-
localPropertiesFile.withReader('UTF-8') { reader ->
11-
localProperties.load(reader)
12-
}
13-
}
14-
15-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
16-
if (flutterVersionCode == null) {
17-
flutterVersionCode = '1'
18-
}
19-
20-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
21-
if (flutterVersionName == null) {
22-
flutterVersionName = '1.0'
23-
}
24-
258
android {
26-
namespace "com.example.examples"
27-
compileSdkVersion flutter.compileSdkVersion > 34 ? flutter.compileSdkVersion : 34
28-
ndkVersion flutter.ndkVersion
9+
namespace = "com.example.example"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
2912

3013
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
3316
}
3417

3518
kotlinOptions {
36-
jvmTarget = '1.8'
37-
}
38-
39-
sourceSets {
40-
main.java.srcDirs += 'src/main/kotlin'
19+
jvmTarget = JavaVersion.VERSION_17
4120
}
4221

4322
defaultConfig {
4423
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
45-
applicationId "com.example.examples"
24+
applicationId = "com.example.example"
4625
// You can update the following values to match your application needs.
47-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
48-
minSdkVersion flutter.minSdkVersion > 21 ? flutter.minSdkVersion : 21
49-
targetSdkVersion flutter.targetSdkVersion
50-
versionCode flutterVersionCode.toInteger()
51-
versionName flutterVersionName
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
5231
}
5332

5433
buildTypes {
5534
release {
5635
// TODO: Add your own signing config for the release build.
5736
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
5938
}
6039
}
6140
}
6241

6342
flutter {
64-
source '../..'
43+
source = "../.."
6544
}
66-
67-
dependencies {}

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

example/android/settings.gradle

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ pluginManagement {
55
def flutterSdkPath = properties.getProperty("flutter.sdk")
66
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
77
return flutterSdkPath
8-
}
9-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
109

11-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1211

13-
plugins {
14-
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
1516
}
1617
}
1718

18-
include ":app"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.3.2" apply false
22+
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
23+
}
1924

20-
apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
25+
include ":app"

example/pubspec.yaml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: examples
2-
description: A new Flutter project.
1+
name: example
2+
description: "A new Flutter project."
33
# The following line prevents the package from being accidentally published to
44
# pub.dev using `flutter pub publish`. This is preferred for private packages.
55
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: '>=3.1.0-262.3.beta <4.0.0'
22+
sdk: ^3.5.4
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -34,9 +34,10 @@ dependencies:
3434

3535
# The following adds the Cupertino Icons font to your application.
3636
# Use with the CupertinoIcons class for iOS style icons.
37-
cupertino_icons: ^1.0.2
38-
qr_flutter: ^4.1.0
39-
wechat_kit: ^6.0.1
37+
cupertino_icons: ^1.0.8
38+
openiothub_common_pages:
39+
path: ../
40+
openiothub_constants: ^1.0.0
4041

4142
dev_dependencies:
4243
flutter_test:
@@ -47,10 +48,7 @@ dev_dependencies:
4748
# activated in the `analysis_options.yaml` file located at the root of your
4849
# package. See that file for information about deactivating specific lint
4950
# rules and activating additional ones.
50-
flutter_lints: ^2.0.0
51-
openiothub_common_pages:
52-
path: ../
53-
openiothub_constants: ^1.0.0
51+
flutter_lints: ^4.0.0
5452

5553
# For information on the generic Dart part of this file, see the
5654
# following page: https://dart.dev/tools/pub/pubspec
@@ -69,10 +67,10 @@ flutter:
6967
# - images/a_dot_ham.jpeg
7068

7169
# An image asset can refer to one or more resolution-specific "variants", see
72-
# https://flutter.dev/assets-and-images/#resolution-aware
70+
# https://flutter.dev/to/resolution-aware-images
7371

7472
# For details regarding adding assets from package dependencies, see
75-
# https://flutter.dev/assets-and-images/#from-packages
73+
# https://flutter.dev/to/asset-from-package
7674

7775
# To add custom fonts to your application, add a fonts section here,
7876
# in this "flutter" section. Each entry in this list should have a
@@ -92,8 +90,5 @@ flutter:
9290
# weight: 700
9391
#
9492
# For details regarding fonts from package dependencies,
95-
# see https://flutter.dev/custom-fonts/#from-packages
96-
wechat_kit:
97-
# ios: no_pay # 默认 pay
98-
app_id: wx9211939fcd68a318
99-
universal_link: https://iothub.cloud/app/openiothub/
93+
# see https://flutter.dev/to/font-from-package
94+

0 commit comments

Comments
 (0)