Skip to content

Commit 1956a67

Browse files
committed
Merge branch 'master' of github.com:Fintasys/emoji_picker_flutter
2 parents 90a19e3 + c4955bf commit 1956a67

26 files changed

+392
-342
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
env:
13-
flutter_version: "3.24.0"
13+
flutter_version: "3.27.1"
1414

1515
jobs:
1616
build:

example/android/app/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26+
namespace 'com.fintasys.emoji_picker_flutter_example'
27+
2628
compileSdkVersion 34
2729

2830
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
31+
sourceCompatibility JavaVersion.VERSION_17
32+
targetCompatibility JavaVersion.VERSION_17
3133
}
3234

3335
kotlinOptions {
34-
jvmTarget = '1.8'
36+
jvmTarget = '17'
3537
}
3638

3739
sourceSets {

example/android/build.gradle

+12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ allprojects {
33
google()
44
mavenCentral()
55
}
6+
7+
subprojects {
8+
afterEvaluate { project ->
9+
if (project.hasProperty('android')) {
10+
project.android {
11+
if (namespace == null) {
12+
namespace project.group
13+
}
14+
}
15+
}
16+
}
17+
}
618
}
719

820
rootProject.buildDir = '../build'

example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-7.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

example/android/settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
id "com.android.application" version "8.3.2" apply false
22+
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
2323
}
2424

2525
include ":app"

example/ios/Flutter/Debug.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"

example/ios/Flutter/Release.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

example/ios/Podfile

-51
This file was deleted.

example/ios/Podfile.lock

-42
This file was deleted.

0 commit comments

Comments
 (0)