Updated dependencies

Author: sockeqwe

app/build.gradle

@@ -44,13 +44,13 @@ dependencies {
     implementation rootProject.ext.recyclerView
     implementation rootProject.ext.core
     implementation rootProject.ext.constraintLayout
+    implementation rootProject.ext.kotlinStdLib
 
     implementation project(':library')
     implementation project(':paging')
     implementation project(':kotlin-dsl')
     implementation project(':kotlin-dsl-layoutcontainer')
     implementation project(':kotlin-dsl-viewbinding')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 repositories {
     mavenCentral()

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.6.0'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -22,12 +22,17 @@ allprojects {
 
 
 ext {
+    compileSdk = 31
+    targetSdk = 31
+    minSdk = 14
+    kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     recyclerView = 'androidx.recyclerview:recyclerview:1.2.1'
     appCompat = 'androidx.appcompat:appcompat:1.3.1'
     androidAnnotations = 'androidx.annotation:annotation:1.3.0'
     core = 'androidx.core:core:1.7.0'
     paging = "androidx.paging:paging-runtime:2.0.0"
-    compileSdk = 31
+    junit = 'junit:junit:4.12'
+    mockito = 'org.mockito:mockito-inline:2.21.0'
     constraintLayout = 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     javaSourceCompatibility = JavaVersion.VERSION_1_8

kotlin-dsl-layoutcontainer/build.gradle

@@ -1,28 +1,19 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "com.vanniktech.maven.publish"
 
 androidExtensions {
     experimental = true
 }
 
-gradle.ext.isCiServer = System.getenv().containsKey("CI")
-logger.warn("Running on CI: ${gradle.ext.isCiServer}")
-
-if (gradle.ext.isCiServer) {
-    apply plugin: "com.vanniktech.maven.publish"
-    mavenPublish {
-        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
     buildTypes {
         release {
@@ -43,11 +34,8 @@ android {
 
 dependencies {
     api project(":library")
+    implementation rootProject.ext.kotlinStdLib
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.mockito
 }
-
-// apply from: 'https://raw.github.com/sockeqwe/gradle-mvn-push/master/gradle-mvn-push.gradle'
-// apply from: 'https://raw.githubusercontent.com/Tickaroo/findbugs-script/master/findbugs.gradle'

kotlin-dsl-viewbinding/build.gradle

@@ -1,28 +1,20 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "com.vanniktech.maven.publish"
+
 
 androidExtensions {
     experimental = true
 }
 
-gradle.ext.isCiServer = System.getenv().containsKey("CI")
-logger.warn("Running on CI: ${gradle.ext.isCiServer}")
-
-if (gradle.ext.isCiServer) {
-    apply plugin: "com.vanniktech.maven.publish"
-    mavenPublish {
-        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
     buildTypes {
         release {
@@ -47,11 +39,8 @@ android {
 
 dependencies {
     api project(":library")
+    implementation rootProject.ext.kotlinStdLib
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.mockito
 }
-
-// apply from: 'https://raw.github.com/sockeqwe/gradle-mvn-push/master/gradle-mvn-push.gradle'
-// apply from: 'https://raw.githubusercontent.com/Tickaroo/findbugs-script/master/findbugs.gradle'

kotlin-dsl/build.gradle

@@ -1,23 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: "com.vanniktech.maven.publish"
 
-gradle.ext.isCiServer = System.getenv().containsKey("CI")
-logger.warn("Running on CI: ${gradle.ext.isCiServer}")
-
-if (gradle.ext.isCiServer) {
-    apply plugin: "com.vanniktech.maven.publish"
-    mavenPublish {
-        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
     buildTypes {
         release {
@@ -38,8 +29,8 @@ android {
 
 dependencies {
     api project(":library")
+    implementation rootProject.ext.kotlinStdLib
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.mockito
 }

library/build.gradle

@@ -1,22 +1,12 @@
 apply plugin: 'com.android.library'
-
-gradle.ext.isCiServer = System.getenv().containsKey("CI")
-logger.warn("Running on CI: ${gradle.ext.isCiServer}")
-
-if (gradle.ext.isCiServer) {
-    apply plugin: "com.vanniktech.maven.publish"
-    mavenPublish {
-        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
+apply plugin: "com.vanniktech.maven.publish"
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
     buildTypes {
         release {
@@ -39,9 +29,6 @@ dependencies {
     api rootProject.ext.recyclerView
     api rootProject.ext.androidAnnotations
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.mockito
 }
-
-// apply from: 'https://raw.github.com/sockeqwe/gradle-mvn-push/master/gradle-mvn-push.gradle'
-// apply from: 'https://raw.githubusercontent.com/Tickaroo/findbugs-script/master/findbugs.gradle'

paging/build.gradle

@@ -1,22 +1,12 @@
 apply plugin: 'com.android.library'
-
-gradle.ext.isCiServer = System.getenv().containsKey("CI")
-logger.warn("Running on CI: ${gradle.ext.isCiServer}")
-
-if (gradle.ext.isCiServer) {
-    apply plugin: "com.vanniktech.maven.publish"
-    mavenPublish {
-        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
+apply plugin: "com.vanniktech.maven.publish"
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
     buildTypes {
         release {
@@ -37,11 +27,9 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation project(":library")
     api rootProject.ext.paging
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.mockito
 }