updated gradle

DrKLO · Jan 1, 2025 · 040931f · 040931f
1 parent 648ad5a
commit 040931f
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 53 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -1,14 +1,13 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-
-apply plugin: 'com.android.library'
-
-repositories {
-    mavenCentral()
-    google()
+import org.gradle.internal.os.OperatingSystem
+import java.nio.file.Paths
+plugins {
+    id 'com.android.library'
+    id 'com.google.gms.google-services'
 }
 
 configurations {
-    compile.exclude module: 'support-v4'
+compile.exclude module: 'support-v4'
 }
 
 configurations.all {
@@ -29,16 +28,17 @@ dependencies {
 
     compileOnly 'org.checkerframework:checker-qual:2.5.2'
     compileOnly 'org.checkerframework:checker-compat-qual:2.5.0'
-    implementation 'com.google.firebase:firebase-messaging:22.0.0'
-    implementation 'com.google.firebase:firebase-config:21.0.1'
-    implementation 'com.google.firebase:firebase-datatransport:18.1.0'
+    implementation 'com.google.firebase:firebase-messaging:23.2.0'
+    implementation 'com.google.firebase:firebase-config:21.4.1'
+    implementation 'com.google.firebase:firebase-datatransport:18.1.8'
     implementation 'com.google.firebase:firebase-appindexing:20.0.0'
     implementation 'com.google.android.gms:play-services-maps:18.1.0'
-    implementation 'com.google.android.gms:play-services-auth:20.4.0'
+    implementation 'com.google.android.gms:play-services-auth:20.6.0'
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
     implementation 'com.google.android.gms:play-services-wearable:18.0.0'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
-    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
+    implementation 'com.google.android.gms:play-services-wallet:19.2.0'
+    implementation 'com.google.android.gms:play-services-safetynet:18.0.1'
     implementation 'com.googlecode.mp4parser:isoparser:1.0.6'
     implementation 'com.stripe:stripe-android:2.0.2'
     implementation 'com.google.mlkit:language-id:16.1.1'
@@ -64,15 +64,21 @@ dependencies {
 
 def isWindows = String.valueOf(DefaultNativePlatform.currentOperatingSystem.toFamilyName() == OperatingSystemFamily.WINDOWS)
 android {
+<<<<<<< HEAD
     compileSdkVersion 34
     buildToolsVersion '34.0.0'
+=======
+    namespace 'org.telegram.messenger'
+    compileSdkVersion 33
+    buildToolsVersion '33.0.0'
+>>>>>>> b27b9ff56 (updated gradle)
     ndkVersion "21.4.7075529"
 
     sourceSets.main.jniLibs.srcDirs = ['./jni/']
 
     externalNativeBuild {
         cmake {
-            path 'jni/CMakeLists.txt'
+        path 'jni/CMakeLists.txt'
         }
     }
 
@@ -87,14 +93,15 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
 
         coreLibraryDesugaringEnabled true
     }
 
 
     defaultConfig {
+        defaultConfig.versionCode Integer.parseInt(APP_VERSION_CODE)
         minSdkVersion 19
         targetSdkVersion 34
 
@@ -106,10 +113,20 @@ android {
             cmake {
                 version '3.10.2'
                 arguments '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-16'
+<<<<<<< HEAD
+=======
+                System.getenv("PATH").split(File.pathSeparator).any { path ->
+                    var file = Paths.get("${path}${File.separator}ccache${if (OperatingSystem.current().windows) ".exe" else ""}").toFile()
+                    if (file.exists()) {
+                        println("Using ccache ${file.getAbsolutePath()}")
+                        arguments += "-DANDROID_CCACHE=${file.getAbsolutePath()}"
+                        return true
+                    }
+                }
+>>>>>>> b27b9ff56 (updated gradle)
             }
         }
     }
-
     buildTypes {
         debug {
             jniDebuggable true
@@ -179,7 +196,7 @@ android {
 
         release {
             jniDebuggable false
-            minifyEnabled true
+            minifyEnabled false
             shrinkResources false
             multiDexEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), '../TMessagesProj/proguard-rules.pro'
@@ -189,6 +206,7 @@ android {
             buildConfigField "boolean", "DEBUG_VERSION", "false"
             buildConfigField "boolean", "DEBUG_PRIVATE_VERSION", "false"
             buildConfigField "boolean", "BUILD_HOST_IS_WINDOWS", isWindows
+            signingConfig signingConfigs.debug
         }
     }
     namespace 'org.telegram.messenger'
@@ -204,6 +222,7 @@ def getProps(String propName) {
     } else {
         return "";
     }
+<<<<<<< HEAD
 }
 apply plugin: 'com.google.gms.google-services'
 
@@ -227,4 +246,7 @@ task checkVisibility {
     }
 }
 
-preBuild.dependsOn checkVisibility
+preBuild.dependsOn checkVisibility
+=======
+}
+>>>>>>> b27b9ff56 (updated gradle)
diff --git a/TMessagesProj_App/build.gradle b/TMessagesProj_App/build.gradle
@@ -1,10 +1,7 @@
-apply plugin: 'com.android.application'
-
-repositories {
-    mavenCentral()
-    google()
+plugins {
+    id 'com.android.application'
+    id 'com.google.gms.google-services'
 }
-
 configurations {
     compile.exclude module: 'support-v4'
 }
@@ -22,6 +19,7 @@ dependencies {
 }
 
 android {
+    namespace 'org.telegram.messenger.regular'
     compileSdkVersion 34
     buildToolsVersion '34.0.0'
 
@@ -91,7 +89,7 @@ android {
             debuggable false
             jniDebuggable false
             signingConfig signingConfigs.release
-            minifyEnabled true
+            minifyEnabled false
             shrinkResources false
             multiDexEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), '../TMessagesProj/proguard-rules.pro'
@@ -199,5 +197,3 @@ android {
         checkReleaseBuilds false
     }
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/TMessagesProj_AppHockeyApp/build.gradle b/TMessagesProj_AppHockeyApp/build.gradle
@@ -1,8 +1,6 @@
-apply plugin: 'com.android.application'
-
-repositories {
-    mavenCentral()
-    google()
+plugins {
+    id 'com.android.application'
+    id 'com.google.gms.google-services'
 }
 
 configurations {
@@ -28,6 +26,7 @@ dependencies {
 }
 
 android {
+    namespace 'org.telegram.messenger.regular'
     compileSdkVersion 34
     buildToolsVersion '34.0.0'
 
@@ -184,5 +183,3 @@ android {
         checkReleaseBuilds false
     }
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/TMessagesProj_AppHuawei/build.gradle b/TMessagesProj_AppHuawei/build.gradle
@@ -1,10 +1,7 @@
-apply plugin: 'com.android.application'
-apply plugin: 'com.huawei.agconnect'
-
-repositories {
-    mavenCentral()
-    google()
-    maven { url 'https://developer.huawei.com/repo/' }
+plugins {
+    id 'com.android.application'
+    //id 'com.huawei.agconnect'
+id 'com.google.gms.google-services'
 }
 
 configurations {
@@ -30,8 +27,10 @@ dependencies {
 }
 
 android {
+    namespace 'org.telegram.messenger.huawei'
     compileSdkVersion 34
     buildToolsVersion '34.0.0'
+>>>>>>> b27b9ff56 (updated gradle)
 
     defaultConfig.applicationId = APP_PACKAGE
 
@@ -163,5 +162,3 @@ android {
         checkReleaseBuilds false
     }
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/TMessagesProj_AppStandalone/build.gradle b/TMessagesProj_AppStandalone/build.gradle
@@ -1,10 +1,7 @@
-apply plugin: 'com.android.application'
-
-repositories {
-    mavenCentral()
-    google()
+plugins {
+    id 'com.android.application'
+    id 'com.google.gms.google-services'
 }
-
 configurations {
     compile.exclude module: 'support-v4'
 }
@@ -24,6 +21,7 @@ dependencies {
 }
 
 android {
+    namespace 'org.telegram.messenger.regular'
     compileSdkVersion 34
     buildToolsVersion '34.0.0'
 

diff --git a/build.gradle b/build.gradle
@@ -11,6 +11,8 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.9.1.301'
     }
 }
-repositories {
-    google()
+plugins {
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.google.gms.google-services' version '4.3.15' apply false
+    id 'com.huawei.agconnect' version '1.9.1.300' apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 19 01:57:36 MSK 2020
+#Sat Jul 29 20:41:11 MSK 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,23 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+        maven {
+            url 'https://developer.huawei.com/repo/'
+        }
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url 'https://developer.huawei.com/repo/'
+        }
+    }
+}
 include ':TMessagesProj'
 include ':TMessagesProj_App'
 include ':TMessagesProj_AppHuawei'