Merge remote-tracking branch 'github/main'
# Conflicts: # android/build.gradle # ios/flutter_openim_sdk.podspec
This commit is contained in:
		
						commit
						6573f03e96
					
				| @ -1,3 +1,7 @@ | |||||||
|  | ## 3.8.2 | ||||||
|  | 
 | ||||||
|  | - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.2) | ||||||
|  |    | ||||||
| ## 3.8.1+2 | ## 3.8.1+2 | ||||||
| 
 | 
 | ||||||
| - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1) | - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1) | ||||||
|  | |||||||
| @ -15,6 +15,10 @@ def getCurrentProjectDir() { | |||||||
| 
 | 
 | ||||||
| buildscript { | buildscript { | ||||||
|     repositories { |     repositories { | ||||||
|  |         maven { url 'https://maven.aliyun.com/repository/public' } | ||||||
|  |         maven { url 'https://maven.aliyun.com/repository/central' } | ||||||
|  |         maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' } | ||||||
|  |         maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } | ||||||
|         google() |         google() | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|     } |     } | ||||||
| @ -38,7 +42,7 @@ rootProject.allprojects { | |||||||
| apply plugin: 'com.android.library' | apply plugin: 'com.android.library' | ||||||
| 
 | 
 | ||||||
| android { | android { | ||||||
|     compileSdkVersion 30 |     compileSdkVersion 34 | ||||||
| 
 | 
 | ||||||
|     defaultConfig { |     defaultConfig { | ||||||
|         minSdkVersion 21 |         minSdkVersion 21 | ||||||
| @ -53,5 +57,5 @@ android { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     implementation 'com.openim:sdkcore:1.0.0' |     implementation 'com.openim:sdkcore:1.0.2' | ||||||
| } | } | ||||||
| @ -2,7 +2,7 @@ import 'package:flutter/services.dart'; | |||||||
| import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; | import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; | ||||||
| 
 | 
 | ||||||
| class OpenIM { | class OpenIM { | ||||||
|   static const version = '3.8.1+2'; |   static const version = '3.8.2+1'; | ||||||
| 
 | 
 | ||||||
|   static const _channel = MethodChannel('flutter_openim_sdk'); |   static const _channel = MethodChannel('flutter_openim_sdk'); | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										24
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								pubspec.lock
									
									
									
									
									
								
							| @ -63,18 +63,18 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: leak_tracker |       name: leak_tracker | ||||||
|       sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" |       sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "10.0.4" |     version: "10.0.5" | ||||||
|   leak_tracker_flutter_testing: |   leak_tracker_flutter_testing: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: leak_tracker_flutter_testing |       name: leak_tracker_flutter_testing | ||||||
|       sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" |       sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.0.3" |     version: "3.0.5" | ||||||
|   leak_tracker_testing: |   leak_tracker_testing: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @ -95,18 +95,18 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: material_color_utilities |       name: material_color_utilities | ||||||
|       sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" |       sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "0.8.0" |     version: "0.11.1" | ||||||
|   meta: |   meta: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: meta |       name: meta | ||||||
|       sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" |       sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "1.12.0" |     version: "1.15.0" | ||||||
|   path: |   path: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @ -164,10 +164,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: test_api |       name: test_api | ||||||
|       sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" |       sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "0.7.0" |     version: "0.7.2" | ||||||
|   vector_math: |   vector_math: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @ -180,10 +180,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: vm_service |       name: vm_service | ||||||
|       sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" |       sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "14.2.1" |     version: "14.2.5" | ||||||
| sdks: | sdks: | ||||||
|   dart: ">=3.3.0 <4.0.0" |   dart: ">=3.3.0 <4.0.0" | ||||||
|   flutter: ">=3.18.0-18.0.pre.54" |   flutter: ">=3.18.0-18.0.pre.54" | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| name: flutter_openim_sdk | name: flutter_openim_sdk | ||||||
| description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source. | description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source. | ||||||
| version: 3.8.1+2 | version: 3.8.2+1 | ||||||
| homepage: https://www.openim.io | homepage: https://www.openim.io | ||||||
| repository: https://github.com/openimsdk/open-im-sdk-flutter | repository: https://github.com/openimsdk/open-im-sdk-flutter | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user