Skip to content

Commit

Permalink
Merge pull request #4 from Kyash/bump_up_libraries
Browse files Browse the repository at this point in the history
Bump up libraries
  • Loading branch information
konifar authored Jun 17, 2020
2 parents f8d7565 + 8de3abc commit 6fe4cf4
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/android:api-26-alpha
- image: circleci/android:api-28-alpha

working_directory: ~/repo

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/build
/captures
.externalNativeBuild
example/publisher-key.json
example/release.keystore

# not ignore
!.idea/codeStyleSettings.xml
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ buildscript {
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.30"
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
classpath 'com.github.triplet.gradle:play-publisher:2.8.0'
}
}

Expand Down
20 changes: 14 additions & 6 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.github.triplet.play'

def versionMajor = 0
def versionMinor = 1
Expand Down Expand Up @@ -52,24 +53,31 @@ android {
}
}

play {
serviceAccountCredentials = file('publisher-key.json')
defaultToAppBundles = true
track = 'production' // internal/alpha/beta/production
releaseStatus = "inProgress" // completed/draft/inProgress/halted
}

dependencies {
implementation project(':library')

//==================== Kotlin ====================
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin"

//==================== Support Library ====================
implementation "com.android.support:appcompat-v7:$supportLibrary"
implementation "com.android.support:design:$supportLibrary"

//==================== Structure ====================
implementation "io.reactivex.rxjava2:rxjava:2.1.9"
implementation "io.reactivex.rxjava2:rxjava:2.2.19"

//==================== Test ====================
testImplementation "junit:junit:4.12"
testImplementation "junit:junit:4.13"
testImplementation "com.nhaarman:mockito-kotlin:1.5.0"
testImplementation "org.robolectric:robolectric:3.5.1"
androidTestImplementation "com.android.support.test:runner:1.0.1"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
androidTestImplementation "com.android.support.test.espresso:espresso-intents:3.0.1"
androidTestImplementation "com.android.support.test:runner:1.0.2"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
androidTestImplementation "com.android.support.test.espresso:espresso-intents:3.0.2"
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.jvmargs=-Xmx1536m
# Versions
compileSdk=26
targetSdk=26
compileSdk=28
targetSdk=28
minSdk=19
kotlin=1.2.30
kotlin=1.3.72
supportLibrary=27.1.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-6.5-all.zip
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ android {

dependencies {
//==================== Kotlin ====================
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin"

//==================== Structure ====================
implementation "io.reactivex.rxjava2:rxjava:2.1.9"
implementation "io.reactivex.rxjava2:rxjava:2.2.19"

//==================== Test ====================
testImplementation "junit:junit:4.12"
testImplementation "junit:junit:4.13"
testImplementation "com.nhaarman:mockito-kotlin:1.5.0"
testImplementation "org.robolectric:robolectric:3.5.1"
}
Expand Down

0 comments on commit 6fe4cf4

Please sign in to comment.