Skip to content

pull #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MahmoudKok wants to merge 6 commits into
base: master
Choose a base branch
from
Open

pull #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eef8b70
Update AndroidManifest.xml
MahmoudKok Sep 10, 2024
74e7af6
Update build.gradle
MahmoudKok Sep 10, 2024
1ed64bc
Update gradle-wrapper.properties
MahmoudKok Sep 10, 2024
3d94be0
Update build.gradle
MahmoudKok Sep 10, 2024
bb894ef
Update build.gradle
MahmoudKok Sep 10, 2024
2ab106c
Update build.gradle
MahmoudKok Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ group 'com.pusher'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.android.tools.build:gradle:8.6.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -25,7 +25,8 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 30
compileSdkVersion 34
namespace 'com.pusher_channels_flutter'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -47,6 +48,6 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'com.pusher:pusher-java-client:2.+'
api 'com.google.code.gson:gson:2.+'
api 'com.pusher:pusher-java-client:2.4.4'
api 'com.google.code.gson:gson:2.11.0'
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
3 changes: 1 addition & 2 deletions android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pusher.channels_flutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>