Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on: push

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Runs a set of commands using the runners shell
#- name: Install NDK
# run: |
# $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0
- name: Setup cmake
run: $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2.4988404" --channel=0
- name: Build
run: ./gradlew assembleRelease
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
DashJ BLS for Android
#DashJ Libraries for Android
This library provides JNI for these:
- dashj-bls (BLS signatures)
- dashj-scrypt (scrypt)
- dashu-x11 (x11 hashing algorithm)

Publish to Maven
##Publish to Maven Local
```
./gradlew assemble
```

##Publish to Maven
```
./gradlew uploadArchives
```
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

//classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
10 changes: 4 additions & 6 deletions dashj-bls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ plugins {
id 'maven-publish'
id 'maven'
id 'signing'
id 'kotlin-android'
id 'kotlin-kapt'
}
android {
compileSdkVersion 29
Expand Down Expand Up @@ -37,7 +35,6 @@ android {
main.java.srcDirs += 'src/main/java'
}

kotlinOptions { jvmTarget = '1.8' }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand All @@ -48,6 +45,8 @@ android {
path 'cpp/CMakeLists.txt'
}
}

ndkVersion "21.1.6352462"
}

version '0.18.1'
Expand All @@ -59,7 +58,6 @@ dependencies {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}

task javadoc(type: Javadoc) {
Expand Down Expand Up @@ -93,11 +91,11 @@ uploadArchives {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

pom.project {
Expand Down
9 changes: 0 additions & 9 deletions dashj-bls/src/main/res/drawable/ic_android_black_24dp.xml

This file was deleted.

3 changes: 2 additions & 1 deletion dashj-scrypt/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
/.cxx
4 changes: 2 additions & 2 deletions dashj-scrypt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ uploadArchives {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

pom.project {
Expand Down
3 changes: 2 additions & 1 deletion dashj-x11/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
/.cxx
6 changes: 3 additions & 3 deletions dashj-x11/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
}

dependencies {

testImplementation 'junit:junit:4.13.2'
}

task javadoc(type: Javadoc) {
Expand Down Expand Up @@ -72,11 +72,11 @@ uploadArchives {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: project.hasProperty('ossrhUsername')?project.findProperty('ossrhUsername'):'', password: project.hasProperty('ossrhPassword')?project.findProperty('ossrhPassword'):'')
}

pom.project {
Expand Down

This file was deleted.

17 changes: 0 additions & 17 deletions dashj-x11/src/test/java/org/dashj/x11/X11Test.java

This file was deleted.