Merge pull request #61 from naninydhruva/naninydhruva/fix_compatability

FIX: Android compatibility issue with latest version and gradle 8.x.x
diefferson · Dec 4, 2023 · cf5a374 · cf5a374
2 parents 8ecbf50 + d2fc9e1
commit cf5a374
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,34 +2,41 @@ group 'diefferson.http_certificate_pinning'
 version '1.0.3'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
-
+    compileSdk 34
+    namespace = "diefferson.http_certificate_pinning"
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+    compileOptions{
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions{
+        jvmTarget ='17'
+    }
     defaultConfig {
         minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Dec 04 16:41:03 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="diefferson.http_certificate_pinning">
+  >
 </manifest>