update

jpistomo · Sep 5, 2024 · a706a8f · a706a8f
1 parent 06e7413
commit a706a8f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 40 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,18 +4,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     namespace "com.tencent.qcloud.tuikit.tuicallkit.demo"
 
     defaultConfig {
         applicationId "com.tencent.trtc"
         versionName "1.0"
         versionCode 1
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 34
         multiDexEnabled true
         ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a'
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
 
@@ -44,7 +44,7 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     api project(":tuicallkit-kt")
     api project(':debug')
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // Optional, if you use support library fragments:

diff --git a/build.gradle b/build.gradle
@@ -1,27 +1,22 @@
-import org.gradle.util.VersionNumber
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
 
+    ext {
+        agp_version = '8.5.0'
+    }
     repositories {
         google()
         mavenCentral()
         maven { url "https://mirrors.tencent.com/nexus/repository/maven-public/" }
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        VersionNumber currentGradleVersion = VersionNumber.parse(gradle.gradleVersion)
-        if (currentGradleVersion.major >= 8) {
             classpath 'com.android.tools.build:gradle:8.0.2'
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
-        } else {
-            classpath 'com.android.tools.build:gradle:4.2.1'
-            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
-        }
 
         // delete it without offline push function
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.2'
     }
 }
 
@@ -35,6 +30,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 12 20:24:45 CST 2020
+#Thu Sep 05 11:21:05 WIB 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,4 @@
+jdk:
+  - openjdk17
+before_install:
+  - ./scripts/prepareJitpackEnvironment.sh
diff --git a/tuicallkit-kt/build.gradle b/tuicallkit-kt/build.gradle
@@ -1,18 +1,17 @@
-import org.gradle.util.VersionNumber
-
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'maven-publish'
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     namespace "com.tencent.qcloud.tuikit.tuicallkit"
 
     defaultConfig {
         versionName "1.0"
         versionCode 1
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 34
     }
 
@@ -22,11 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    def callSourceJavaVersion = JavaVersion.VERSION_1_8
-    VersionNumber currentGradleVersion = VersionNumber.parse(gradle.gradleVersion)
-    if (currentGradleVersion.major >= 8) {
-        callSourceJavaVersion = JavaVersion.VERSION_17
-    }
+    def callSourceJavaVersion = JavaVersion.VERSION_17
 
     compileOptions {
         sourceCompatibility callSourceJavaVersion
@@ -36,25 +31,39 @@ android {
 
 dependencies {
 
-    api 'androidx.appcompat:appcompat:1.3.1'
-    api 'com.google.android.material:material:1.4.0'
-    api 'androidx.recyclerview:recyclerview:1.2.1'
-    api 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api 'androidx.appcompat:appcompat:1.7.0'
+    api 'com.google.android.material:material:1.12.0'
+    api 'androidx.recyclerview:recyclerview:1.3.2'
+    api 'androidx.constraintlayout:constraintlayout:2.1.4'
     api 'com.github.bumptech.glide:glide:4.12.0'
-    def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
-    println "all projects : {$projects}"
-    if (projects.contains("tuicore")) {
-        api project(':tuicore')
-    } else {
+//    def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
+//    println "all projects : {$projects}"
+//    if (projects.contains("tuicore")) {
+//        api project(':tuicore')
+//    } else {
         api "com.tencent.imsdk:imsdk-plus:8.1.6103"
         api "com.tencent.liteav.tuikit:tuicore:8.1.6900"
-    }
+//    }
 
-    if (projects.contains("tuicallengine")) {
-        api project(':tuicallengine')
-    } else {
-        api "com.google.code.gson:gson:2.9.1"
+//    if (projects.contains("tuicallengine")) {
+//        api project(':tuicallengine')
+//    } else {
+        api "com.google.code.gson:gson:2.10.1"
         api rootProject.getProperties().containsKey("liteavSdk") ? rootProject.ext.liteavSdk : "com.tencent.liteav:LiteAVSDK_Professional:11.8.0.14176"
         api 'com.tencent.liteav.tuikit:tuicallengine:2.5.0.1020'
-    }
+//    }
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = 'com.github.jpistomo'
+                artifactId = 'tui-callkit'
+                version = '1.0.0'
+            }
+        }
+    }
+}