Skip to content

Commit

Permalink
Added gh-pages and fixed rx module
Browse files Browse the repository at this point in the history
  • Loading branch information
ToxicBakery committed Jan 11, 2019
1 parent faa9e6b commit e7fb7a4
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 7 deletions.
25 changes: 21 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@

defaults: &defaults
working_directory: ~/repo
docker:
- image: toxicbakery/alpine-glibc-android:release-1.3.3
- image: toxicbakery/alpine-glibc-android:release-2.0
environment:
TERM: dumb

branches:
ignore:
- gh-pages

version: 2
jobs:
build:
Expand All @@ -20,10 +25,19 @@ jobs:
echo "signing.keyId=${SIGNING_KEY}" >> "gradle.properties"
echo "signing.password=${SIGNING_PASSWORD}" >> "gradle.properties"
echo "signing.secretKeyRingFile=../maven.keystore" >> "gradle.properties"
echo "signing.secretKeyRingFile=../../maven.keystore" >> "tools/gradle.properties"
gpg --cipher-algo AES256 --yes --batch --passphrase=$ENC_FILE_KEY maven.keystore.gpg
cp maven.keystore tools/maven.keystore
./gradlew build publish --no-daemon
./gradlew build dokkaGhPages publish --no-daemon
if [ "master" = "$CIRCLE_BRANCH" ]; then
git config --global user.email $GH_EMAIL
git config --global user.name $GH_NAME
cp -r .circleci core/gh-pages/.circleci
cd common/gh-pages
git init
git checkout --orphan gh-pages
git add -A
git commit -m "Automated deployment of ${CIRCLE_BRANCH} ${CIRCLE_SHA1}" --allow-empty
git push -q https://${GH_PERSONAL_TOKEN}@github.com/ToxicBakery/${CIRCLE_PROJECT_REPONAME}.git gh-pages --force
fi
else
./gradlew build --no-daemon
fi
Expand All @@ -37,3 +51,6 @@ workflows:
filters:
tags:
only: /.*/
branches:
ignore:
- gh-pages
3 changes: 2 additions & 1 deletion core/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/build
/out
/.gradle
/*.iml
/*.iml
/gh-pages
27 changes: 25 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,29 @@ kotlin {
}
}

task dokkaGhPages(type: org.jetbrains.dokka.gradle.DokkaTask) {
impliedPlatforms = ["Common", "JS", "JVM"]
kotlinTasks { [] }
outputFormat = 'html'
outputDirectory = "${project.projectDir}/gh-pages"
sourceRoot {
path = kotlin.sourceSets.commonMain.kotlin.srcDirs[0]
platforms = ["Common"]
}
sourceRoot {
path = kotlin.sourceSets.jsMain.kotlin.srcDirs[0]
platforms = ["JS"]
}
sourceRoot {
path = kotlin.sourceSets.jvmMain.kotlin.srcDirs[0]
platforms = ["JVM"]
}
sourceRoot {
path = kotlin.sourceSets.jvmRxMain.kotlin.srcDirs[0]
platforms = ["JVM"]
}
}

task dokkaCommon(type: org.jetbrains.dokka.gradle.DokkaTask) {
impliedPlatforms = ["Common"]
kotlinTasks { [] }
Expand Down Expand Up @@ -130,11 +153,11 @@ task dokkajvm(type: org.jetbrains.dokka.gradle.DokkaTask) {

task dokkajvmRx(type: org.jetbrains.dokka.gradle.DokkaTask) {
impliedPlatforms = ["JVM", "Common"]
kotlinTasks { [] }
kotlinTasks { [compileKotlinJvmRx] }
jdkVersion = 6
outputFormat = 'html'
outputDirectory = "$buildDir/javadoc/jvmRx"
classpath = [new File("$buildDir/libs/core-jvmrx-${version}.jar")]
//classpath = [new File("$buildDir/libs/core-jvmrx-${version}.jar")]
sourceRoot {
path = kotlin.sourceSets.commonMain.kotlin.srcDirs[0]
platforms = ["Common"]
Expand Down

0 comments on commit e7fb7a4

Please sign in to comment.