Skip to content

Commit

Permalink
cleaned up gradle files
Browse files Browse the repository at this point in the history
  • Loading branch information
anirudhramanan committed Jan 22, 2020
1 parent ff50f2f commit 959bcf1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 58 deletions.
8 changes: 2 additions & 6 deletions app/build.gradle
@@ -1,7 +1,5 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

android {
Expand Down Expand Up @@ -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'
Expand All @@ -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'
}
4 changes: 0 additions & 4 deletions build.gradle
Expand Up @@ -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" }
}
}
Expand Down
10 changes: 1 addition & 9 deletions gradle.properties
Expand Up @@ -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
kotlin.code.style=official
23 changes: 3 additions & 20 deletions madman-okhttp/build.gradle
Expand Up @@ -20,30 +20,15 @@ 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"

defaultConfig {
minSdkVersion 17
targetSdkVersion 29
versionName libraryVersion
versionCode libraryCode
versionName "1.0.0"
versionCode 1

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
Expand All @@ -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'
21 changes: 2 additions & 19 deletions madman/build.gradle
Expand Up @@ -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"
Expand All @@ -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'
Expand Down Expand Up @@ -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'

0 comments on commit 959bcf1

Please sign in to comment.