Apply patch from https://github.com/daadu/receive_intent/pull/29
Some checks failed
analysis / package-analysis (push) Has been cancelled
Some checks failed
analysis / package-analysis (push) Has been cancelled
This commit is contained in:
parent
f7d1f35712
commit
93f70e9ed5
7 changed files with 197 additions and 18 deletions
184
29.patch
Normal file
184
29.patch
Normal file
|
@ -0,0 +1,184 @@
|
|||
From 0aea50296aa0995d95b1d8e5fea6740789e2cabc Mon Sep 17 00:00:00 2001
|
||||
From: luckyrat <luckyrat@musites.com>
|
||||
Date: Fri, 9 Aug 2024 10:38:35 +0100
|
||||
Subject: [PATCH 1/3] Compile and target API 34
|
||||
|
||||
---
|
||||
android/build.gradle | 2 +-
|
||||
example/android/app/build.gradle | 8 ++------
|
||||
example/android/app/src/main/AndroidManifest.xml | 2 +-
|
||||
3 files changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/android/build.gradle b/android/build.gradle
|
||||
index fe07d5e..286b91b 100644
|
||||
--- a/android/build.gradle
|
||||
+++ b/android/build.gradle
|
||||
@@ -29,7 +29,7 @@ android {
|
||||
namespace 'com.bhikadia.receive_intent'
|
||||
}
|
||||
|
||||
- compileSdkVersion 30
|
||||
+ compileSdk 34
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
|
||||
index 2b53f3b..20fe243 100644
|
||||
--- a/example/android/app/build.gradle
|
||||
+++ b/example/android/app/build.gradle
|
||||
@@ -30,7 +30,7 @@ android {
|
||||
namespace "com.bhikadia.receive_intent_example"
|
||||
}
|
||||
|
||||
- compileSdkVersion flutter.compileSdkVersion
|
||||
+ compileSdk flutter.compileSdkVersion
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
@@ -49,7 +49,7 @@ android {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId "com.bhikadia.receive_intent_example"
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
- targetSdkVersion flutter.targetSdkVersion
|
||||
+ targetSdkVersion 34
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
@@ -66,7 +66,3 @@ android {
|
||||
flutter {
|
||||
source '../..'
|
||||
}
|
||||
-
|
||||
-dependencies {
|
||||
- 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
|
||||
index 3192446..c5f5177 100644
|
||||
--- a/example/android/app/src/main/AndroidManifest.xml
|
||||
+++ b/example/android/app/src/main/AndroidManifest.xml
|
||||
@@ -5,7 +5,7 @@
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
- android:exported="false"
|
||||
+ android:exported="true"
|
||||
android:launchMode="singleTop"
|
||||
android:theme="@style/LaunchTheme"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||
|
||||
From 47da31d767f8cf73b1c37df0cb0ca6d84ead0a21 Mon Sep 17 00:00:00 2001
|
||||
From: luckyrat <luckyrat@musites.com>
|
||||
Date: Fri, 9 Aug 2024 10:39:32 +0100
|
||||
Subject: [PATCH 2/3] Target Kotlin 1.9
|
||||
|
||||
---
|
||||
android/build.gradle | 2 +-
|
||||
example/android/build.gradle | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/android/build.gradle b/android/build.gradle
|
||||
index 286b91b..bc01ecf 100644
|
||||
--- a/android/build.gradle
|
||||
+++ b/android/build.gradle
|
||||
@@ -2,7 +2,7 @@ group 'com.bhikadia.receive_intent'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
buildscript {
|
||||
- ext.kotlin_version = '1.7.22'
|
||||
+ ext.kotlin_version = '1.9.25'
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
diff --git a/example/android/build.gradle b/example/android/build.gradle
|
||||
index 513ce39..0d39e09 100644
|
||||
--- a/example/android/build.gradle
|
||||
+++ b/example/android/build.gradle
|
||||
@@ -1,5 +1,5 @@
|
||||
buildscript {
|
||||
- ext.kotlin_version = '1.8.10'
|
||||
+ ext.kotlin_version = '1.9.25'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
||||
From 13c662cbfb3a8f67984a8ffae1baf4e0f9e79aef Mon Sep 17 00:00:00 2001
|
||||
From: luckyrat <luckyrat@musites.com>
|
||||
Date: Fri, 9 Aug 2024 10:57:22 +0100
|
||||
Subject: [PATCH 3/3] Upgrade to AGP 8.5 + Gradle 8.7
|
||||
|
||||
---
|
||||
android/build.gradle | 5 ++---
|
||||
android/gradle/wrapper/gradle-wrapper.properties | 2 +-
|
||||
example/android/build.gradle | 6 +++---
|
||||
example/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
|
||||
4 files changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/android/build.gradle b/android/build.gradle
|
||||
index bc01ecf..1a90f63 100644
|
||||
--- a/android/build.gradle
|
||||
+++ b/android/build.gradle
|
||||
@@ -9,7 +9,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- classpath 'com.android.tools.build:gradle:8.2.0'
|
||||
+ classpath 'com.android.tools.build:gradle:8.5.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,5 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||
- implementation "androidx.annotation:annotation:1.3.0"
|
||||
+ implementation "androidx.annotation:annotation:1.8.2"
|
||||
}
|
||||
\ No newline at end of file
|
||||
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
|
||||
index dc159ec..4518132 100644
|
||||
--- a/android/gradle/wrapper/gradle-wrapper.properties
|
||||
+++ b/android/gradle/wrapper/gradle-wrapper.properties
|
||||
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
diff --git a/example/android/build.gradle b/example/android/build.gradle
|
||||
index 0d39e09..665dc0b 100644
|
||||
--- a/example/android/build.gradle
|
||||
+++ b/example/android/build.gradle
|
||||
@@ -2,11 +2,11 @@ buildscript {
|
||||
ext.kotlin_version = '1.9.25'
|
||||
repositories {
|
||||
google()
|
||||
- jcenter()
|
||||
+ mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- classpath 'com.android.tools.build:gradle:8.2.0'
|
||||
+ classpath 'com.android.tools.build:gradle:8.5.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
- jcenter()
|
||||
+ mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
|
||||
index d07c7fc..a35eb1f 100644
|
||||
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
|
||||
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
|
||||
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
|
||||
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
|
@ -2,14 +2,14 @@ group 'com.bhikadia.receive_intent'
|
|||
version '1.0-SNAPSHOT'
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.7.22'
|
||||
ext.kotlin_version = '1.9.25'
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.2.0'
|
||||
classpath 'com.android.tools.build:gradle:8.5.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ android {
|
|||
namespace 'com.bhikadia.receive_intent'
|
||||
}
|
||||
|
||||
compileSdkVersion 30
|
||||
compileSdk 34
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
|
@ -49,6 +49,5 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||
implementation "androidx.annotation:annotation:1.3.0"
|
||||
implementation "androidx.annotation:annotation:1.8.2"
|
||||
}
|
|
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
|
|
|
@ -30,7 +30,7 @@ android {
|
|||
namespace "com.bhikadia.receive_intent_example"
|
||||
}
|
||||
|
||||
compileSdkVersion flutter.compileSdkVersion
|
||||
compileSdk flutter.compileSdkVersion
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
|
@ -49,7 +49,7 @@ android {
|
|||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId "com.bhikadia.receive_intent_example"
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion flutter.targetSdkVersion
|
||||
targetSdkVersion 34
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
|
@ -66,7 +66,3 @@ android {
|
|||
flutter {
|
||||
source '../..'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="false"
|
||||
android:exported="true"
|
||||
android:launchMode="singleTop"
|
||||
android:theme="@style/LaunchTheme"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
buildscript {
|
||||
ext.kotlin_version = '1.8.10'
|
||||
ext.kotlin_version = '1.9.25'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.2.0'
|
||||
classpath 'com.android.tools.build:gradle:8.5.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ buildscript {
|
|||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
|
|
Loading…
Reference in a new issue