diff options
| -rw-r--r-- | .idea/jarRepositories.xml | 5 | ||||
| -rw-r--r-- | .idea/runConfigurations.xml | 3 | ||||
| -rw-r--r-- | android-lib.gradle | 1 | ||||
| -rw-r--r-- | artifacts.gradle | 4 | ||||
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | buildSrc/build.gradle.kts | 4 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/kau/Versions.kt | 21 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
8 files changed, 23 insertions, 22 deletions
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index eb2873e..1e2d92c 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -26,5 +26,10 @@ <option name="name" value="Google" /> <option name="url" value="https://dl.google.com/dl/android/maven2/" /> </remote-repository> + <remote-repository> + <option name="id" value="MavenRepo" /> + <option name="name" value="MavenRepo" /> + <option name="url" value="https://repo.maven.apache.org/maven2/" /> + </remote-repository> </component> </project>
\ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index e497da9..797acea 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -4,9 +4,6 @@ <option name="ignoredProducers"> <set> <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" /> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> </set> </option> </component> diff --git a/android-lib.gradle b/android-lib.gradle index 44ed40b..68a29dd 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -4,7 +4,6 @@ import kau.Versions apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' -apply plugin: 'com.github.dcendents.android-maven' //apply plugin: 'com.getkeepsafe.dexcount' group = "ca.allanwang" diff --git a/artifacts.gradle b/artifacts.gradle index 4471d37..132ce47 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -1,6 +1,6 @@ import groovy.xml.MarkupBuilder -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'maven-publish' // build a jar with source files task sourcesJar(type: Jar) { @@ -12,7 +12,7 @@ task javadoc(type: Javadoc) { failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile + classpath += configurations.implementation } // build a jar with javadoc diff --git a/build.gradle b/build.gradle index c5dfff3..33d7cd0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() maven { url 'https://maven.fabric.io/public' } maven { url "https://plugins.gradle.org/m2/" } } @@ -14,7 +14,6 @@ buildscript { classpath Plugins.android classpath Plugins.kotlin classpath Plugins.bugsnag - classpath Plugins.androidMaven classpath Plugins.playPublisher classpath Plugins.dexCount classpath Plugins.gitVersion @@ -41,7 +40,7 @@ subprojects { repositories { google() - jcenter() + mavenCentral() maven { url "https://jitpack.io" } } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 89cba29..74fbd6d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,10 +1,10 @@ plugins { `kotlin-dsl` - maven +// maven } group = "ca.allanwang" repositories { - jcenter() + mavenCentral() }
\ No newline at end of file diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index 56b6eaa..a3ea16d 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -3,7 +3,7 @@ package kau object Versions { const val coreMinSdk = 19 const val minSdk = 21 - const val targetSdk = 29 + const val targetSdk = 30 // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google const val appcompat = "1.3.0-rc01" @@ -21,20 +21,21 @@ object Versions { const val cardView = "1.0.0" // https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout - const val constraintLayout = "2.1.0-beta01" + const val constraintLayout = "2.1.0-beta02" // https://mvnrepository.com/artifact/androidx.core/core-ktx - const val coreKtx = "1.5.0-rc01" + const val coreKtx = "1.6.0-rc01" // https://kotlinlang.org/docs/reference/using-gradle.html - const val kotlin = "1.4.32" + const val kotlin = "1.5.10" // https://github.com/Kotlin/kotlinx.coroutines/releases - const val coroutines = "1.4.3" + const val coroutines = "1.5.0" // https://github.com/mikepenz/AboutLibraries/releases - const val aboutLibraries = "8.8.5" + const val aboutLibraries = "8.9.0" + // Keep old version // https://github.com/wasabeef/Blurry/releases const val blurry = "3.0.0" @@ -54,11 +55,11 @@ object Versions { const val materialDialog = "3.3.0" // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md - const val koin = "3.0.1" + const val koin = "3.1.0" // https://github.com/google/dagger/releases // https://mvnrepository.com/artifact/com.google.dagger/hilt-android - const val hilt = "2.34.1-beta" + const val hilt = "2.37" // https://mvnrepository.com/artifact/androidx.ui/ui-core?repo=google const val compose = "0.1.0-dev14" @@ -88,7 +89,7 @@ object Versions { const val bugsnagPlugin="5.7.6" // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google - const val gradlePlugin = "4.2.0-rc01" + const val gradlePlugin = "7.1.0-alpha02" // https://github.com/dcendents/android-maven-gradle-plugin/releases const val mavenPlugin = "2.1" @@ -97,7 +98,7 @@ object Versions { const val playPublishPlugin = "3.4.0-agp7.0" // https://github.com/KeepSafe/dexcount-gradle-plugin/releases - const val dexCountPlugin = "2.0.0" + const val dexCountPlugin = "2.1.0-RC01" // https://github.com/gladed/gradle-android-git-version/releases const val gitVersionPlugin = "0.4.14" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 80cf08e..29e4134 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |