chore: Bump internal dependencies (#222)

usefulness · May 1, 2021 · 87a127e · 87a127e
1 parent 9d607c5
commit 87a127e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [0.26.2] - 2021-05-01
+## Fixed
+- Again, fix setting up google repository
+
 ## [0.26.1] - 2021-05-01
 ## Fixed
 - Fix missing dependencies avaibable on `google()` repository
@@ -215,7 +220,8 @@ The new feature is available as automatically registered gradle task, but also c
 [Unreleased]: https://github.com/usefulness/project-starter/compare/release/0.23.0...HEAD
 [0.29.0]: https://github.com/usefulness/project-starter/compare/release/0.28.0.../release/0.29.0
 [0.28.0]: https://github.com/usefulness/project-starter/compare/release/0.27.0.../release/0.28.0
-[0.27.0]: https://github.com/usefulness/project-starter/compare/release/0.26.1.../release/0.27.0
+[0.27.0]: https://github.com/usefulness/project-starter/compare/release/0.26.2.../release/0.27.0
+[0.26.2]: https://github.com/usefulness/project-starter/compare/release/0.26.1.../release/0.26.2
 [0.26.1]: https://github.com/usefulness/project-starter/compare/release/0.26.0.../release/0.26.1
 [0.26.0]: https://github.com/usefulness/project-starter/compare/release/0.25.0.../release/0.26.0
 [0.25.0]: https://github.com/usefulness/project-starter/compare/release/0.24.0.../release/0.25.0

diff --git a/Readme.md b/Readme.md
@@ -5,7 +5,7 @@ ___
 &nbsp;[![build](https://github.com/usefulness/project-starter/workflows/Build%20project/badge.svg)](https://github.com/usefulness/project-starter/actions)
 &nbsp;[![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
 
-[![version](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com/project/starter/plugins/maven-metadata.xml?label=gradle)](https://plugins.gradle.org/search?term=com.starter) 
+[![version](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com/project/starter/jvm/maven-metadata.xml?label=gradle)](https://plugins.gradle.org/search?term=com.starter) 
 
 
 ## Motivation

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     implementation "com.gradle.publish:plugin-publish-plugin:0.13.0"
-    implementation "com.project.starter:jvm:0.26.0"
+    implementation "com.project.starter:jvm:0.26.1"
 }
 
 gradlePlugin {

diff --git a/jvm/src/main/kotlin/com/project/starter/modules/internal/Repositories.kt b/jvm/src/main/kotlin/com/project/starter/modules/internal/Repositories.kt
@@ -3,25 +3,25 @@ package com.project.starter.modules.internal
 import org.gradle.api.Project
 
 internal fun Project.configureRepositories(): Unit = with(repositories) {
-    exclusiveContent { content ->
-        content.forRepository { google() }
-        content.filter {
+    mavenCentral()
+    google { repository ->
+        repository.mavenContent { content ->
             val googleLibraries = listOf(
                 "com\\.android.*",
-                "androidx\\..*",
-                "android\\.arch\\..*",
-                "com\\.google\\.android\\..*",
+                "androidx.*",
+                "android\\.arch.*",
+                "com\\.google\\.android.*",
                 "com\\.google\\.gms",
-                "com\\.google\\.test",
-                "com\\.google\\.ads\\..*",
-                "com\\.google\\.ar\\..*",
+                "com\\.google\\.test.*",
+                "com\\.google\\.ads.*",
+                "com\\.google\\.ar.*",
                 "com\\.google\\.mlkit.*",
                 "com\\.google\\.devtools.*",
                 "com\\.google\\.assistant.*",
                 "com\\.google\\.oboe.*",
                 "com\\.google\\.prefab.*",
             )
-            googleLibraries.forEach(it::includeGroupByRegex)
+            googleLibraries.forEach(content::includeGroupByRegex)
         }
     }
     exclusiveContent { content ->
@@ -30,5 +30,4 @@ internal fun Project.configureRepositories(): Unit = with(repositories) {
         }
         content.filter { it.includeGroup("org.jacoco") }
     }
-    mavenCentral()
 }