diff --git a/build.gradle b/build.gradle index 9c349992..844b46a0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,11 @@ buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -16,7 +16,7 @@ plugins { allprojects { repositories { - jcenter() + mavenCentral() google() maven { url "https://jitpack.io" } } diff --git a/chatkit/build.gradle b/chatkit/build.gradle index ad99aae0..70bfeeeb 100644 --- a/chatkit/build.gradle +++ b/chatkit/build.gradle @@ -2,11 +2,12 @@ apply plugin: 'com.android.library' apply plugin: 'maven-publish' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + namespace 'com.stfalcon.chatkit' + compileSdkVersion 34 defaultConfig { minSdkVersion 14 + targetSdkVersion 34 versionCode 1 versionName '0.4.1' consumerProguardFiles 'proguard.txt' @@ -18,33 +19,31 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - afterEvaluate { - publishing { - publications { - // Creates a Maven publication called "release". - release(MavenPublication) { - // Applies the component for the release build variant. - from components.release - - // You can then customize attributes of the publication as shown below. - groupId = 'com.github.stfalcon' - artifactId = 'chatkit' - version = '0.4.1' - } - } - } + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' - implementation "com.google.android:flexbox:1.0.0" - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.10.0' + implementation "com.google.android:flexbox:3.0.0" + implementation 'androidx.recyclerview:recyclerview:1.3.2' +} + +publishing { + publications { + // Creates a Maven publication called "release". + release(MavenPublication) { + // Applies the component for the release build variant. + singleVariant("release") + + // You can then customize attributes of the publication as shown below. + groupId = 'com.github.stfalcon' + artifactId = 'chatkit' + version = '0.4.1' + } + } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b12ede36..2a8d8466 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index ec6c1258..4824fa05 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + namespace 'com.stfalcon.chatkit.sample' + compileSdkVersion 34 defaultConfig { applicationId "com.stfalcon.chatkit.sample" minSdkVersion 14 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -23,8 +24,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } @@ -32,23 +33,21 @@ dependencies { implementation project(':chatkit') implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - testImplementation 'junit:junit:4.13' + androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1') + testImplementation 'junit:junit:4.13.2' - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.10.0' //Picasso - implementation "com.squareup.picasso:picasso:2.71828" + implementation "com.squareup.picasso:picasso:2.8" //ImageViews - implementation "de.hdodenhof:circleimageview:2.2.0" + implementation "de.hdodenhof:circleimageview:3.1.0" implementation "com.github.siyamed:android-shape-imageview:0.9.3" //Utils - implementation "me.relex:circleindicator:1.2.2@aar" + implementation "me.relex:circleindicator:2.1.6@aar" }