Merge pull request #227 from Instabug/chore/gradle-versions

Ali Abdelfattah · web-flow · commit 48d9c3e4262d · 2022-06-22T19:06:13.000+02:00
[MOB-8378] Bump Gradle versions
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,18 +4,18 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -24,15 +24,22 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 28
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard-rules.txt'
     }
+
     lintOptions {
         disable 'InvalidPackage'
     }
 }
+
 dependencies {
     implementation 'com.instabug.library:instabug:11.2.0'
     testImplementation 'junit:junit:4.12'
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,16 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +49,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.InstabugSample"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.6.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
 	        url "https://sdks.instabug.com/nexus/repository/instabug-cp"
 	    }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/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-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,18 @@ version '1.0-SNAPSHOT'`
`4`	`4`	`buildscript {`
`5`	`5`	`repositories {`
`6`	`6`	`google()`
`7`		`- jcenter()`
	`7`	`+ mavenCentral()`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:3.5.4'`
	`11`	`+ classpath 'com.android.tools.build:gradle:4.1.0'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`rootProject.allprojects {`
`16`	`16`	`repositories {`
`17`	`17`	`google()`
`18`		`- jcenter()`
	`18`	`+ mavenCentral()`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`@@ -24,15 +24,22 @@ apply plugin: 'com.android.library'`
`24`	`24`	`android {`
`25`	`25`	`compileSdkVersion 28`
`26`	`26`
	`27`	`+ compileOptions {`
	`28`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`29`	`+ targetCompatibility JavaVersion.VERSION_1_8`
	`30`	`+ }`
	`31`	`+`
`27`	`32`	`defaultConfig {`
`28`	`33`	`minSdkVersion 16`
`29`	`34`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`30`	`35`	`consumerProguardFiles 'proguard-rules.txt'`
`31`	`36`	`}`
	`37`	`+`
`32`	`38`	`lintOptions {`
`33`	`39`	`disable 'InvalidPackage'`
`34`	`40`	`}`
`35`	`41`	`}`
	`42`	`+`
`36`	`43`	`dependencies {`
`37`	`44`	`implementation 'com.instabug.library:instabug:11.2.0'`
`38`	`45`	`testImplementation 'junit:junit:4.12'`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.4.32'`
	`2`	`+ ext.kotlin_version = '1.6.20'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`		`- jcenter()`
	`5`	`+ mavenCentral()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.5.4'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.1.0'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`allprojects {`
`15`	`15`	`repositories {`
`16`	`16`	`google()`
`17`		`- jcenter()`
	`17`	`+ mavenCentral()`
`18`	`18`	`maven {`
`19`	`19`	`url "https://sdks.instabug.com/nexus/repository/instabug-cp"`
`20`	`20`	`}`