Upgrade to Gradle 6.7.1 (#46)

Author: karivatj

.github/workflows/compile.yml

@@ -25,4 +25,4 @@ jobs:
     - name: Setup Android build environment
       uses: android-actions/[email protected]
     - name: Local install
-      run: ./gradlew clean uploadArchives -PSNAPSHOT=true -PLOCAL=true
+      run: ./gradlew clean publishToMavenLocal

README.md

@@ -72,7 +72,7 @@ After including the dependencies and refreshing, you can use the `NoGameServiceC
 ### Building from source
 To build from source, clone or download this repository, then open it in Android Studio. Perform the following command to compile and upload the library in your local repository:
 
-    gradlew clean uploadArchives -PLOCAL=true
+    gradlew clean publishToMavenLocal
 
 See `build.gradle` file for current version to use in your dependencies.
 

android-amazongc/build.gradle

@@ -1,54 +1,33 @@
-apply plugin: 'com.android.library'
-
-project.group = 'de.golfgl.gdxgamesvcs'
-
-buildscript {
-    repositories {
-        maven { url 'https://plugins.gradle.org/m2/' }
-        google()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-    }
-}
-
 android {
-    compileSdkVersion compileSdk
-    buildToolsVersion "${buildTools}"
+    compileSdkVersion compileSdkVer
 
     defaultConfig {
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        minSdkVersion minSdkVer
+        targetSdkVersion targetSdkVer
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             res.srcDirs = ['res']
-
         }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
-
 }
 
 dependencies {
-    compile project(":core")
-    compile files('libs/gamecirclesdk.jar')
-    compile files('libs/login-with-amazon-sdk.jar')
-    compile files('libs/AmazonInsights-android-sdk-2.1.26.jar')
+    implementation files('libs/gamecirclesdk.jar')
+    implementation files('libs/login-with-amazon-sdk.jar')
+    implementation files('libs/AmazonInsights-android-sdk-2.1.26.jar')
 }
 
 ext {
     ARTIFACTID = 'gdx-gamesvcs-android-amazongc'
 }
 
 apply from: '../androidpublish.gradle'
-

android-gpgs/build.gradle

@@ -1,46 +1,45 @@
-apply plugin: 'com.android.library'
-
-project.group = 'de.golfgl.gdxgamesvcs'
-
 buildscript {
     repositories {
-        maven { url 'https://plugins.gradle.org/m2/' }
         google()
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.google.gms:google-services:4.3.10'
     }
 }
 
+apply plugin: 'com.google.gms.google-services'
+
 android {
-    compileSdkVersion compileSdk
-    buildToolsVersion "${buildTools}"
+    compileSdkVersion compileSdkVer
 
     defaultConfig {
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        minSdkVersion minSdkVer
+        targetSdkVersion targetSdkVer
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             res.srcDirs = ['res']
-
         }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+}
 
-
+dependencies {
+    implementation 'com.google.android.gms:play-services-auth:19.2.0'
+    implementation 'com.google.android.gms:play-services-games:21.0.0'
 }
 
 ext {
     ARTIFACTID = 'gdx-gamesvcs-android-gpgs'
 }
 
-apply from: '../androidpublish.gradle'
+apply from: '../androidpublish.gradle'

android-gpgs/src/de/golfgl/gdxgamesvcs/GpgsClient.java

@@ -4,8 +4,9 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.android.AndroidApplication;

android-huawei/build.gradle

@@ -1,55 +1,44 @@
-apply plugin: 'com.android.library'
-
-project.group = 'de.golfgl.gdxgamesvcs'
-
 buildscript {
     repositories {
-        maven { url 'https://plugins.gradle.org/m2/' }
         google()
+        gradlePluginPortal()
         maven { url 'https://developer.huawei.com/repo/' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.huawei.agconnect:agcp:1.3.2.301'
     }
 }
 
 android {
-    compileSdkVersion compileSdk
-    buildToolsVersion "${buildTools}"
+    compileSdkVersion compileSdkVer
 
     defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion targetSdk
+        minSdkVersion minSdkVer
+        targetSdkVersion targetSdkVer
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             res.srcDirs = ['res']
-
         }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
-
 }
 
 dependencies {
-    implementation project(":core")
     implementation 'com.huawei.hms:game:5.0.1.301'
     implementation 'com.huawei.hms:hwid:5.0.1.301'
-    implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
 }
 
 ext {
     ARTIFACTID = 'gdx-gamesvcs-android-huawei'
 }
 
-apply from: '../androidpublish.gradle'
+apply from: '../androidpublish.gradle'

androidpublish.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 def isLocalBuild() {
@@ -52,95 +52,89 @@ def getVersion() {
     }
 }
 
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            pom.groupId = getGroupId()
-            pom.version = getVersion()
-            pom.artifactId = getArtifactId()
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    archiveClassifier.set('javadoc')
+    from androidJavadocs.destinationDir
+}
 
-            if (isLocalBuild()) {
-                repository(url: getLocalRepositoryUrl())
-            } else {
-                if (isReleaseBuild()) {
-                    repository(url: getReleaseRepositoryUrl()) {
-                        authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                    }
-                }
-                if (isSnapshotBuild()) {
-                    snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                        authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                    }
-                }
-            }
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
 
+afterEvaluate { //For android we need to wrap the publishing inside afterEvaluate
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
 
+                groupId = GROUPID
+                artifactId = ARTIFACTID
+                version = getVersion()
 
+                println 'Publishing artifact: ' + GROUPID + ':' + ARTIFACTID + '-' + getVersion()
 
-            pom.project {
-                name 'gdx-gamesvcs'
-                description 'Gameservices APIs for libGDX'
-                url 'https://github.com/MrStahlfelge/gdx-gamesvcs'
+                pom {
+                    name = libraryName
+                    description = libraryDescription
+                    url = librarySiteUrl
 
-                scm {
-                    url 'scm:[email protected]:MrStahlfelge/gdx-gamesvcs.git'
-                    connection 'scm:[email protected]:MrStahlfelge/gdx-gamesvcs.git'
-                    developerConnection 'scm:[email protected]:MrStahlfelge/gdx-gamesvcs.git'
-                }
+                    licenses {
+                        license {
+                            name = licenseName
+                            url = licenseUrl
+                        }
+                    }
 
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        distribution 'repo'
+                    developers {
+                        developer {
+                            id = developerId
+                            name = developerName
+                            email = developerEmail
+                        }
                     }
-                }
 
-                developers {
-                    developer {
-                        id 'MrStahlfelge'
-                        name 'Benjamin Schulte'
-                        email '[email protected]'
+                    scm {
+                        url = libraryGitUrl
+                        connection = "scm:$libraryGitUrl"
+                        developerConnection = "scm:$libraryGitUrl"
                     }
                 }
             }
         }
-    }
-}
 
-signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
+        repositories {
+            if (isReleaseBuild()) {
+                maven {
+                    credentials {
+                        username = getRepositoryUsername()
+                        password = getRepositoryPassword()
+                    }
 
+                    url getReleaseRepositoryUrl()
+                }
+            }
+            if (isSnapshotBuild()) {
+                maven {
+                    credentials {
+                        username = getRepositoryUsername()
+                        password = getRepositoryPassword()
+                    }
 
-task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    // JDK 1.8 is more strict then 1.7. Have JDK 1.8 behave like 1.7 for javadoc generation
-    if (org.gradle.internal.jvm.Jvm.current().getJavaVersion() == JavaVersion.VERSION_1_8) {
-        options.addStringOption('Xdoclint:none', '-quiet')
+                    url getSnapshotRepositoryUrl()
+                }
+            }
+        }
     }
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'javadoc'
-    from androidJavadocs.destinationDir
-}
 
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-artifacts {
-    archives androidSourcesJar
-    archives androidJavadocsJar
+    signing {
+        required { isReleaseBuild() }
+        sign publishing.publications.release
+    }
 }
-
-afterEvaluate {
-    androidJavadocs.classpath += project.android.libraryVariants.toList().first().javaCompile.classpath
-}