Merge branch 'master' of https://github.com/OpenInstall/openinstall-flutter-plugin

loadingCooper · loadingCooper · commit 41117385390f · 2025-03-17T20:45:37.000+08:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,14 @@
+name: Publish to pub.dev
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+
+jobs:
+  publish:
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    # with:
+    #   working-directory: path/to/package/within/repository
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.5.3
+Android 更新 SDK 到 2.8.5
+
 ## 2.5.2
 iOS 补充getOpid获取
 
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ openinstall插件封装了openinstall平台原生SDK，集成了 **渠道统计,
 
 ``` json 
 dependencies:
-  openinstall_flutter_plugin: ^2.1.2
+  openinstall_flutter_plugin: ^2.5.2
 ```
 
 ### 2. 安装插件
diff --git a/android/libs/OpenInstall_v2.8.4.jar b/android/libs/OpenInstall_v2.8.4.jar
diff --git a/android/libs/OpenInstall_v2.8.5.jar b/android/libs/OpenInstall_v2.8.5.jar
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -22,29 +22,38 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    lintOptions {
-        disable 'InvalidPackage'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.openinstall.openinstall_flutter_plugin_example"
-        minSdkVersion 16
-        targetSdkVersion 33
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
 
         manifestPlaceholders = [
                 OPENINSTALL_APPKEY : "ufp21n",
         ]
-
     }
 
     buildTypes {
@@ -61,8 +70,7 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,18 +1,20 @@
 buildscript {
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -24,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,15 +1,11 @@
 include ':app'
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
-}
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
 export "FLUTTER_ROOT=D:\Android\flutter"
-export "FLUTTER_APPLICATION_PATH=D:\workspace\OP\openinstall_flutter_plugin\example"
+export "FLUTTER_APPLICATION_PATH=D:\workspace\op-github\openinstall_flutter_plugin\example"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=false"
+export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.packages"
+export "PACKAGE_CONFIG=.dart_tool/package_config.json"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -9,10 +9,6 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openinstall_flutter_plugin
 description: openinstall_flutter_plugin is a Flutter plugin based on openinstall, and with null safety support.
-version: 2.5.2
+version: 2.5.3
 homepage: https://www.openinstall.io
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,20 @@`
`1`	`1`	`buildscript {`
	`2`	`+ ext.kotlin_version = '1.7.10'`
`2`	`3`	`repositories {`
`3`	`4`	`google()`
`4`		`- jcenter()`
	`5`	`+ mavenCentral()`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.1.3'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.2.0'`
	`10`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`9`	`11`	`}`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`allprojects {`
`13`	`15`	`repositories {`
`14`	`16`	`google()`
`15`		`- jcenter()`
	`17`	`+ mavenCentral()`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
`@@ -24,6 +26,6 @@ subprojects {`
`24`	`26`	`project.evaluationDependsOn(':app')`
`25`	`27`	`}`
`26`	`28`
`27`		`-task clean(type: Delete) {`
	`29`	`+tasks.register("clean", Delete) {`
`28`	`30`	`delete rootProject.buildDir`
`29`	`31`	`}`