diff --git a/README.md b/README.md index 35fec9b..040c0c3 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ and then add dependency ```groovy dependencies { - implementation 'com.github.varunest:TheGlowingLoader:1.0.5' + implementation 'com.github.varunest:TheGlowingLoader:1.0.6' } ``` diff --git a/app/build.gradle b/app/build.gradle index 75eedbd..d7d0f17 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,13 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { compileSdkVersion 27 defaultConfig { applicationId "com.example.varun.theglowingloader" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -26,5 +28,5 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation project(':theglowingloader') -// implementation 'com.github.varunest:TheGlowingLoader:1.0.0' + // implementation 'com.github.varunest:TheGlowingLoader:1.0.6' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 92afbcd..f75d00d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 69b3a1a..d830b53 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,19 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { -buildscript { - - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' - + /** + * You should use `apply false` in the top-level build.gradle file + * to add a Gradle plugin as a build dependency, but not apply it to the + * current (root) project. You should not use `apply false` in sub-projects. + * For more information, see + * Applying external plugins with same version to subprojects. + */ - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - maven { url 'https://jitpack.io' } - } + id 'com.android.application' version '7.2.0' apply false + id 'com.android.library' version '7.2.0' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } task clean(type: Delete) { delete rootProject.buildDir } + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 401c9ee..1f6b584 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip diff --git a/settings.gradle b/settings.gradle index 0fd2f2f..be9c6de 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,41 @@ +pluginManagement { + + /** + * The pluginManagement {repositories {...}} block configures the + * repositories Gradle uses to search or download the Gradle plugins and + * their transitive dependencies. Gradle pre-configures support for remote + * repositories such as JCenter, Maven Central, and Ivy. You can also use + * local repositories or define your own remote repositories. The code below + * defines the Gradle Plugin Portal, Google's Maven repository, + * and the Maven Central Repository as the repositories Gradle should use to look for its dependencies. + */ + + repositories { + gradlePluginPortal() + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } +} +dependencyResolutionManagement { + + /** + * The dependencyResolutionManagement { repositories {...}} + * block is where you configure the repositories and dependencies used by + * all modules in your project, such as libraries that you are using to + * create your application. However, you should configure module-specific + * dependencies in each module-level build.gradle file. For new projects, + * Android Studio includes Google's Maven repository + * and the Maven Central Repository by + * default, but it does not configure any dependencies (unless you select a + * template that requires some). + */ + + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } +} include ':app', ':theglowingloader' diff --git a/theglowingloader/build.gradle b/theglowingloader/build.gradle index a1eeb16..4e9293a 100644 --- a/theglowingloader/build.gradle +++ b/theglowingloader/build.gradle @@ -8,7 +8,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 27 - + versionCode 6 + versionName "1.0.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" }