Merge pull request #212 from arturCwiklinsky/upgrade_gradle_project

szprutamich · web-flow · commit 5c90c9825bb3 · 2025-02-20T18:52:10.000+01:00
Upgrade gradle dependencies and settings
diff --git a/README.md b/README.md
@@ -1,19 +1,29 @@
 Gradle plugin to deploys apks to BitBar cloud and launches test run.
 
+## Developing and building gradle plugin locally
+
+To build and publish gradle plugin locally run
+
+```bash
+./gradlew clean build publishToMavenLocal -PenableAutoPublish
+```
+
+## Running gradle plugin
+
 A typical project build.gradle will look like this:
 
     plugins {
         id 'com.android.application'
-        id 'testdroid' version '3.26' apply true
+        id 'testdroid' version '3.38' apply true
     }
 
     android {
-        compileSdk 32
+        compileSdk 34
 
         defaultConfig {
             applicationId "com.example.myapplication"
             minSdk 21
-            targetSdk 32
+            targetSdk 34
             versionCode 1
             versionName "1.0"
 
@@ -33,12 +43,13 @@ A typical project build.gradle will look like this:
     }
     
     dependencies {
-        implementation 'androidx.appcompat:appcompat:1.3.0'
-        implementation 'com.google.android.material:material:1.4.0'
-        implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-        testImplementation 'junit:junit:4.13.2'
-        androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-        androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+        implementation 'androidx.appcompat:appcompat:1.7.0'
+        implementation 'com.google.android.material:material:1.12.0'
+        implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
+        testImplementation 'junit:junit:4.12'
+        androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+        androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     }
     
     testdroid {
@@ -50,13 +61,14 @@ A typical project build.gradle will look like this:
         deviceGroup 'My devices'
     }
 
-
-
-With above configuration your application and instrumentation package 
+With above configuration your application and instrumentation package
 are uploaded into BitBar Cloud and test run is launched using device from group 'My Devices'
 
-To launch test run from command line use testdroidUpload task:
->./gradlew testdroidUpload
+To launch test run from command line use task:
+
+```bash
+./gradlew testdroidUpload
+```
 
 You can fully control your testrun using the same configurations options which are available via BitBar Cloud web UI.
 
diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'java-gradle-plugin'
 
-project.group = GROUP_ID
-project.archivesBaseName = ARTIFACT_ID
-project.version = VERSION_NAME
+group = GROUP_ID
+version = VERSION_NAME
+
+base {
+    archivesName = ARTIFACT_ID
+}
 
 repositories {
     mavenCentral()
@@ -23,47 +26,47 @@ dependencies {
     gradleApi gradleApi()
     groovy localGroovy()
 
-    implementation 'com.android.tools.build:builder-test-api:8.2.2'
-    implementation 'com.android.tools:annotations:31.2.2'
-    implementation 'com.testdroid:testdroid-api:3.26'
-    implementation 'com.google.guava:guava:31.1-jre'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
-    testImplementation 'com.android.tools.build:gradle:8.2.2'
-    testImplementation 'com.android.tools.build:gradle-core:3.1.4'
-
-    implementation 'com.google.protobuf:protobuf-java:3.21.8'
-
-    testImplementation 'io.netty:netty-codec-http:4.1.106.Final'
-    testImplementation 'io.netty:netty-codec-http2:4.1.106.Final'
-    testImplementation 'com.google.code.gson:gson:2.9.0'
-    testImplementation 'commons-io:commons-io:2.11.0'
-    testImplementation 'org.apache.commons:commons-compress:1.21'
-    testImplementation 'org.jsoup:jsoup:1.17.2'
+    implementation 'com.android.tools.build:builder-test-api:8.8.1'
+    implementation 'com.android.tools:annotations:31.8.1'
+    implementation 'com.testdroid:testdroid-api:3.38.0'
+    implementation 'com.google.guava:guava:33.4.0-jre'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
+    testImplementation 'com.android.tools.build:gradle:8.8.1'
+
+    implementation 'com.google.protobuf:protobuf-java:4.29.3'
+
+    testImplementation 'io.netty:netty-codec-http:4.1.118.Final'
+    testImplementation 'io.netty:netty-codec-http2:4.1.118.Final'
+    testImplementation 'com.google.code.gson:gson:2.12.1'
+    testImplementation 'commons-io:commons-io:2.18.0'
+    testImplementation 'org.apache.commons:commons-compress:1.27.1'
+    testImplementation 'org.jsoup:jsoup:1.18.3'
     testImplementation 'org.jdom:jdom2:2.0.6.1'
     testImplementation 'xerces:xercesImpl:2.12.2'
-    testImplementation 'com.google.crypto.tink:tink:1.6.1'
-
-    // force newer versions due to security issues in gradle-core:3.1.4:
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
-    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
-    testImplementation 'commons-codec:commons-codec:1.16.1'
+    testImplementation 'com.google.crypto.tink:tink:1.16.0'
 }
 
 gradlePlugin {
+    website = 'https://github.com/bitbar/android-gradle-plugin'
+    vcsUrl = 'https://github.com/bitbar/android-gradle-plugin.git'
     plugins {
         testdroid {
+            displayName = 'Testdroid Gradle Plugin'
+            description = 'Gradle plugin to deploys apks to BitBar cloud and launches test run'
+            tags.set(['android', 'bitbar', 'testdroid', 'cloud', 'testing'])
             id = 'testdroid'
             implementationClass = 'com.testdroid.TestDroidPlugin'
 
         }
     }
-    automatedPublishing = false
+    automatedPublishing = project.hasProperty("enableAutoPublish")
 }
 
 // custom tasks for creating source/javadoc jars
-task sourcesJar(type: Jar, dependsOn: classes) {
+tasks.register('sourcesJar', Jar) {
+    dependsOn classes
     archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
@@ -76,11 +79,12 @@ javadoc {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
     archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }
@@ -121,7 +125,7 @@ publishing {
                     license {
                         name = POM_LICENSE_NAME
                         url = POM_LICENSE_URL
-                        distribution = POM_LICENSE_DSITRIBUTIION
+                        distribution = POM_LICENSE_DISTRIBUTION
                     }
                 }
 
@@ -130,11 +134,6 @@ publishing {
                         name = 'Sakari Rautiainen'
                     }
                 }
-                scm {
-                    url = POM_SCM_URL
-                    connection = POM_SCM_CONNECTION
-                    developerConnection = POM_SCM_DEVELOPER_CONNECTION
-                }
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=3.26
+VERSION_NAME=3.38.0
 GROUP_ID=com.testdroid
 ARTIFACT_ID=gradle
 
@@ -12,4 +12,4 @@ POM_SCM_DEVELOPER_CONNECTION=scm:git@github.com:bitbar/android-gradle-plugin.git
 
 POM_LICENSE_NAME=The Apache Software License, Version 2.0
 POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENSE_DSITRIBUTIION=repo
+POM_LICENSE_DISTRIBUTION=repo
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/tests/app/build.gradle b/tests/app/build.gradle
@@ -1,16 +1,16 @@
 plugins {
     id 'com.android.application'
-    id 'testdroid' version '3.26' apply true
+    id 'testdroid' version '3.38.0' apply true
 }
 
 android {
-    compileSdk 32
+    compileSdk 34
     namespace 'com.example.myapplication'
 
     defaultConfig {
         applicationId "com.example.myapplication"
         minSdk 21
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -30,12 +30,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
 
 testdroid {
diff --git a/tests/app/src/main/AndroidManifest.xml b/tests/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication"
-        tools:targetApi="32">
+        tools:targetApi="34">
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/tests/app/src/test/java/com/example/myapplication/ExampleUnitTest.java b/tests/app/src/test/java/com/example/myapplication/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -4,6 +4,6 @@ plugins {
     id 'com.android.library' version '8.2.2' apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ plugins {`
`4`	`4`	`id 'com.android.library' version '8.2.2' apply false`
`5`	`5`	`}`
`6`	`6`
`7`		`-task clean(type: Delete) {`
`8`		`- delete rootProject.buildDir`
	`7`	`+tasks.register('clean', Delete) {`
	`8`	`+ delete rootProject.layout.buildDirectory`
`9`	`9`	`}`