Merge pull request #11 from jens-muenker/update/gradle_8.5

Update to Gradle 8.5

build.gradle

@@ -1,12 +1,4 @@
 buildscript {
-    ext {
-        kotlin_version = '1.9.22'
-        androidx_appcompat_version = "1.6.1"
-        androidx_core_version = '1.12.0'
-        androidx_exifinterface_version = "1.3.6"
-        androidx_transition_version = "1.4.1"
-        constraintlayout_version = "1.1.3"
-    }
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
@@ -25,5 +17,5 @@ allprojects {
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 08 15:37:10 CET 2023
+#Sat Jan 20 15:49:05 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

sample/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 14
         versionName '1.2.6'
     }
-    flavorDimensions "default"
+    flavorDimensions = ["default"]
     buildTypes {
         release {
             minifyEnabled false
@@ -39,8 +39,8 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:${androidx_appcompat_version}"
-    implementation "androidx.core:core-ktx:${androidx_core_version}"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation project(':ucrop')

ucrop/build.gradle

@@ -14,6 +14,7 @@ android {
         minSdkVersion 14
         targetSdk 34
 
+        consumerProguardFiles 'proguard-rules.pro'
         vectorDrawables.useSupportLibrary = true
 
         renderscriptTargetApi 18

ucrop/proguard-rules.pro

@@ -68,3 +68,7 @@
 # -keep public class mypackage.MyClass
 # -keep public interface mypackage.MyInterface
 # -keep public class * implements mypackage.MyInterface
+
+-dontwarn com.yalantis.ucrop**
+-keep class com.yalantis.ucrop** { *; }
+-keep interface com.yalantis.ucrop** { *; }

ucrop/publish.gradle

@@ -11,9 +11,6 @@ tasks.register('androidSourcesJar', Jar) {
     }
 }
 
-group = PUBLISH_GROUP_ID
-version = PUBLISH_VERSION
-
 publishing {
     publications {
         release(MavenPublication) {
@@ -35,7 +32,7 @@ publishing {
                 licenses {
                     license {
                         name = 'uCrop\'n\'Edit License'
-                        url = 'https://github.com/jens-muenker/uCrop-n-Edit'
+                        url = 'https://github.com/jens-muenker/uCrop-n-Edit#license'
                     }
                 }