diff --git a/.circleci/config.yml b/.circleci/config.yml index df7cde9..a02720e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/build.gradle b/build.gradle index 87a8267..064f76c 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } } } diff --git a/example/build.gradle b/example/build.gradle index 3af6ea6..abc3fa4 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -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 @@ -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 { @@ -40,7 +27,7 @@ android { zipAlignEnabled true minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release + signingConfig signingConfigs.debug } } testOptions { @@ -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') diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..adb3fe1 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11 diff --git a/library/build.gradle b/library/build.gradle index c54010a..59fbe23 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'maven-publish' def versionMajor = 0 def versionMinor = 2 @@ -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 { @@ -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 {