Skip to content

Commit

Permalink
Merge pull request #7 from irgaly/v0.2.0_fix_jitpack
Browse files Browse the repository at this point in the history
fix: Jitpack, CircleCI releases
  • Loading branch information
k-kagurazaka authored Aug 6, 2021
2 parents cc1a718 + 1d605bc commit 01005f1
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2
version: 2.1
jobs:
build:
docker:
- image: circleci/android:api-28-alpha
- image: circleci/android:api-30

working_directory: ~/repo

Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@ buildscript {

repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
classpath 'com.github.triplet.gradle:play-publisher:2.8.0'
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
}
}
Expand Down
22 changes: 1 addition & 21 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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 All @@ -17,18 +16,6 @@ android {
targetSdkVersion targetSdk_ as Integer
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "$versionMajor.$versionMinor.$versionPatch"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
signingConfigs {
release {
storeFile file("debug.keystore")
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
}
}
dexOptions {
preDexLibraries false
}
buildTypes {
debug {
Expand All @@ -40,7 +27,7 @@ android {
zipAlignEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
signingConfig signingConfigs.debug
}
}
testOptions {
Expand All @@ -53,13 +40,6 @@ 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')

Expand Down
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk11
13 changes: 12 additions & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'

def versionMajor = 0
def versionMinor = 2
Expand All @@ -16,7 +17,6 @@ android {
targetSdk = targetSdk_ as Integer
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "$versionMajor.$versionMinor.$versionPatch"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand All @@ -27,7 +27,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release
artifactId = "rx-keyboard-detector"
artifact(sourcesJar)
}
}
}
}

dependencies {
Expand Down

0 comments on commit 01005f1

Please sign in to comment.