2.10.1 (Pt2): fix deps for maven-publish

lisawray · May 3, 2022 · 1c84c1a · 1c84c1a
1 parent 930ce0e
commit 1c84c1a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -180,7 +180,7 @@ In your project level `build.gradle` file, include:
 
 ```
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
         mavenCentral()

diff --git a/build.gradle b/build.gradle
@@ -18,8 +18,8 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
         mavenCentral()
+        jcenter()
         maven { url "https://jitpack.io" }
     }
     dependencies {
@@ -37,8 +37,8 @@ allprojects { project ->
 
     repositories {
         google()
-        jcenter()
         mavenCentral()
+        jcenter()
         maven { url "https://jitpack.io" }
     }
 

diff --git a/example/build.gradle b/example/build.gradle
@@ -2,18 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-    }
-}
-
 androidExtensions {
     experimental = true
 }
@@ -43,9 +31,4 @@ dependencies {
     implementation project(':example-shared')
     implementation project(':library')
     implementation project(':library-kotlin-android-extensions')
-}
-
-repositories {
-    mavenCentral()
-    maven { url "https://jitpack.io" }
-}
+}
diff --git a/library-databinding/build.gradle b/library-databinding/build.gradle
@@ -1,14 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
 archivesBaseName = 'groupie-databinding'
 
 android {
@@ -37,8 +29,8 @@ android {
 }
 
 dependencies {
-    compileOnly project(':library')
-    compileOnly "androidx.recyclerview:recyclerview:1.2.1"
+    implementation project(':library')
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     compileOnly("androidx.databinding:databinding-runtime:$databinding_version") {
         transitive = false
     }
@@ -48,7 +40,7 @@ dependencies {
     compileOnly("androidx.databinding:viewbinding:$databinding_version") {
         transitive = false
     }
-    compileOnly("androidx.annotation:annotation:1.3.0")
+    implementation("androidx.annotation:annotation:1.3.0")
 }
 
 

diff --git a/library-kotlin-android-extensions/build.gradle b/library-kotlin-android-extensions/build.gradle
@@ -3,17 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven-publish'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-    }
-}
 
 archivesBaseName = 'groupie-kotlin-android-extensions'
 
@@ -49,12 +38,8 @@ android {
 }
 
 dependencies {
-    compileOnly project(':library')
-    compileOnly "androidx.recyclerview:recyclerview:1.2.1"
-}
-
-repositories {
-    mavenCentral()
+    implementation project(':library')
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
 }
 
 tasks.withType(Javadoc).all {

diff --git a/library-viewbinding/build.gradle b/library-viewbinding/build.gradle
@@ -1,14 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
 archivesBaseName = 'groupie-viewbinding'
 
 android {
@@ -37,12 +29,12 @@ android {
 }
 
 dependencies {
-    compileOnly project(':library')
-    compileOnly("androidx.recyclerview:recyclerview:1.2.1")
+    implementation project(':library')
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
     compileOnly("androidx.databinding:viewbinding:$viewbinding_version") {
         transitive = false
     }
-    compileOnly("androidx.annotation:annotation:1.3.0")
+    implementation("androidx.annotation:annotation:1.3.0")
 }
 
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,14 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
 archivesBaseName = 'groupie'
 
 android {