Gradle: update dependency and _try_ to move away from JCenter

aldebaran · May 14, 2021 · a97d065 · a97d065
1 parent 0892150
commit a97d065
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.softbankrobotics.planning"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -34,7 +34,7 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.0"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.30"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        jcenter() // TODO: remove this when Dokka's dependencies are on maven central.
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
 
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.10.2'
@@ -20,7 +20,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        jcenter() // TODO: remove this when Dokka's dependencies are on maven central.
     }
 
     plugins.withId("com.vanniktech.maven.publish") {

diff --git a/gradle.properties b/gradle.properties
@@ -22,3 +22,16 @@ kotlin.code.style=official
 
 GROUP=com.softbankrobotics.pddl
 VERSION_NAME=1.4.0
+
+POM_URL=https://github.com/aldebaran/pddl-planning-android
+POM_SCM_URL=https://github.com/aldebaran/pddl-planning-android
+POM_SCM_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
+
+POM_LICENCE_NAME=BSD 3-Clause "New" or "Revised" License
+POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=softbank.robotics.europe
+POM_DEVELOPER_NAME=SoftBank Robotics Europe
+POM_DEVELOPER_URL=https://github.com/aldebaran/
diff --git a/pddl-planning-test/build.gradle b/pddl-planning-test/build.gradle
@@ -7,12 +7,12 @@ plugins {
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionName getProperty("VERSION_NAME")
 
         // Rename the output archives to identify them at a glance.
@@ -41,15 +41,15 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.0"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'junit:junit:4.13.1' // We export test functions for planner implementations
     implementation project(path: ':pddl-planning')
     testImplementation 'junit:junit:4.13.1'
-    testImplementation "io.mockk:mockk:1.10.2"
+    testImplementation "io.mockk:mockk:1.11.0"
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation "io.mockk:mockk-android:1.10.2"
+    androidTestImplementation "io.mockk:mockk-android:1.11.0"
 }
diff --git a/pddl-planning-test/gradle.properties b/pddl-planning-test/gradle.properties
@@ -5,16 +5,3 @@ POM_PACKAGING=aar
 
 POM_DESCRIPTION=Common tests for PDDL planners using, based on a unified interface
 POM_INCEPTION_YEAR=2020
-
-POM_URL=https://github.com/aldebaran/pddl-planning-android
-POM_SCM_URL=https://github.com/aldebaran/pddl-planning-android
-POM_SCM_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
-POM_SCM_DEV_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
-
-POM_LICENCE_NAME=BSD 3-Clause "New" or "Revised" License
-POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
-POM_LICENCE_DIST=repo
-
-POM_DEVELOPER_ID=softbank.robotics.europe
-POM_DEVELOPER_NAME=SoftBank Robotics Europe
-POM_DEVELOPER_URL=https://github.com/aldebaran/
diff --git a/pddl-planning/build.gradle b/pddl-planning/build.gradle
@@ -7,12 +7,12 @@ plugins {
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionName getProperty("VERSION_NAME")
 
         // Rename the output archives to identify them at a glance.
@@ -41,11 +41,11 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.0"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

diff --git a/pddl-planning/gradle.properties b/pddl-planning/gradle.properties
@@ -5,16 +5,3 @@ POM_PACKAGING=aar
 
 POM_DESCRIPTION=Kotlin interface for PDDL planners on Android
 POM_INCEPTION_YEAR=2020
-
-POM_URL=https://github.com/aldebaran/pddl-planning-android
-POM_SCM_URL=https://github.com/aldebaran/pddl-planning-android
-POM_SCM_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
-POM_SCM_DEV_CONNECTION=scm:git@github.com:aldebaran/pddl-planning-android.git
-
-POM_LICENCE_NAME=BSD 3-Clause "New" or "Revised" License
-POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
-POM_LICENCE_DIST=repo
-
-POM_DEVELOPER_ID=softbank.robotics.europe
-POM_DEVELOPER_NAME=SoftBank Robotics Europe
-POM_DEVELOPER_URL=https://github.com/aldebaran/