From 959bcf108681b27423a7bf769df2215b30441199 Mon Sep 17 00:00:00 2001 From: anirudhramanan Date: Wed, 22 Jan 2020 22:11:44 +0530 Subject: [PATCH] cleaned up gradle files --- app/build.gradle | 8 ++------ build.gradle | 4 ---- gradle.properties | 10 +--------- madman-okhttp/build.gradle | 23 +++-------------------- madman/build.gradle | 21 ++------------------- 5 files changed, 8 insertions(+), 58 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f152c55..04dab85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,5 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - apply plugin: 'kotlin-android-extensions' android { @@ -30,8 +28,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core-ktx:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.android.exoplayer:exoplayer:2.10.3' implementation 'com.google.android.exoplayer:extension-ima:2.10.3' @@ -41,6 +39,4 @@ dependencies { implementation 'com.google.android.material:material:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/build.gradle b/build.gradle index e0c4e8f..4235a7d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ allprojects { google() jcenter() mavenLocal() - maven { url ARTIFACTORY_REPO_URL + RELEASE_REPO_KEY } - maven { url ARTIFACTORY_REPO_URL + RELEASES_REPO_KEY } - maven { url ARTIFACTORY_REPO_URL + SNAPSHOT_REPO_KEY } - maven { url ARTIFACTORY_REPO_URL + SNAPSHOTS_REPO_KEY } maven { url "https://jitpack.io" } } } diff --git a/gradle.properties b/gradle.properties index 6a83916..376270d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,12 +18,4 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official - -ARTIFACTORY_REPO_URL=http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/ -RELEASE_REPO_KEY=libs-release-local -RELEASES_REPO_KEY=libs-releases-local -SNAPSHOT_REPO_KEY=libs-snapshot-local -SNAPSHOTS_REPO_KEY=libs-snapshots-local -ARTIFACTORY_GROUP=com.flipkart.madman -VERSION_CODE=1 \ No newline at end of file +kotlin.code.style=official \ No newline at end of file diff --git a/madman-okhttp/build.gradle b/madman-okhttp/build.gradle index 5568d87..67cbd6a 100644 --- a/madman-okhttp/build.gradle +++ b/madman-okhttp/build.gradle @@ -20,21 +20,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -project.ext { - mavProjectName = 'Madman' - mavPublishToRemoteRepo = true - mavPublishToMavenLocal = false - mavRepoRemoteUrl = ARTIFACTORY_REPO_URL + "libs-${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'release'}-local" - mavLibraryDescription = "Madman Ad SDK Okhttp" -} - -def libraryVersion = "1.1.11" -def libraryCode = 1 - -/* These identifiers are also used for publishing via maven */ -group = "com.flipkart.madman" -version = libraryVersion - android { compileSdkVersion 29 buildToolsVersion "29.0.2" @@ -42,8 +27,8 @@ android { defaultConfig { minSdkVersion 17 targetSdkVersion 29 - versionName libraryVersion - versionCode libraryCode + versionName "1.0.0" + versionCode 1 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -68,11 +53,9 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.core:core-ktx:1.1.0' implementation 'com.squareup.okhttp3:okhttp:3.14.4' - implementation "com.flipkart.madman:madman:1.1.11" + implementation project(':madman') testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.19.1' testImplementation 'org.robolectric:robolectric:4.3' } - -apply from: 'https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle' \ No newline at end of file diff --git a/madman/build.gradle b/madman/build.gradle index 6d502cd..322c4f4 100644 --- a/madman/build.gradle +++ b/madman/build.gradle @@ -2,21 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -project.ext { - mavProjectName = 'Madman' - mavPublishToRemoteRepo = true - mavPublishToMavenLocal = false - mavRepoRemoteUrl = ARTIFACTORY_REPO_URL + "libs-${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'release'}-local" - mavLibraryDescription = "Madman Ad SDK" -} - -def libraryVersion = "1.1.11" -def libraryCode = 1 - -/* These identifiers are also used for publishing via maven */ -group = "com.flipkart.madman" -version = libraryVersion - android { compileSdkVersion 29 buildToolsVersion "29.0.2" @@ -25,8 +10,8 @@ android { defaultConfig { minSdkVersion 17 targetSdkVersion 29 - versionName libraryVersion - versionCode libraryCode + versionName "1.0.0" + versionCode 1 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -60,5 +45,3 @@ dependencies { testImplementation 'org.mockito:mockito-core:2.19.1' testImplementation 'org.robolectric:robolectric:4.3' } - -apply from: 'https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle'