diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..64bc326 --- /dev/null +++ b/.github/workflows/tests.yml @@ -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 diff --git a/README.md b/README.md index 975e7cc..125093e 100644 --- a/README.md +++ b/README.md @@ -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 ``` \ No newline at end of file diff --git a/build.gradle b/build.gradle index a5a63c2..2243b82 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/dashj-bls/build.gradle b/dashj-bls/build.gradle index 4dc23b0..1252b44 100644 --- a/dashj-bls/build.gradle +++ b/dashj-bls/build.gradle @@ -3,8 +3,6 @@ plugins { id 'maven-publish' id 'maven' id 'signing' - id 'kotlin-android' - id 'kotlin-kapt' } android { compileSdkVersion 29 @@ -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 @@ -48,6 +45,8 @@ android { path 'cpp/CMakeLists.txt' } } + + ndkVersion "21.1.6352462" } version '0.18.1' @@ -59,7 +58,6 @@ dependencies { repositories { mavenLocal() mavenCentral() - jcenter() } task javadoc(type: Javadoc) { @@ -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 { diff --git a/dashj-bls/src/main/res/drawable/ic_android_black_24dp.xml b/dashj-bls/src/main/res/drawable/ic_android_black_24dp.xml deleted file mode 100644 index 0df8cff..0000000 --- a/dashj-bls/src/main/res/drawable/ic_android_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/dashj-scrypt/.gitignore b/dashj-scrypt/.gitignore index 42afabf..7607bd2 100644 --- a/dashj-scrypt/.gitignore +++ b/dashj-scrypt/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/.cxx \ No newline at end of file diff --git a/dashj-scrypt/build.gradle b/dashj-scrypt/build.gradle index c3476b6..4097974 100644 --- a/dashj-scrypt/build.gradle +++ b/dashj-scrypt/build.gradle @@ -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 { diff --git a/dashj-x11/.gitignore b/dashj-x11/.gitignore index 42afabf..7607bd2 100644 --- a/dashj-x11/.gitignore +++ b/dashj-x11/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/.cxx \ No newline at end of file diff --git a/dashj-x11/build.gradle b/dashj-x11/build.gradle index adb10b0..8332aff 100644 --- a/dashj-x11/build.gradle +++ b/dashj-x11/build.gradle @@ -38,7 +38,7 @@ android { } dependencies { - + testImplementation 'junit:junit:4.13.2' } task javadoc(type: Javadoc) { @@ -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 { diff --git a/dashj-x11/src/androidTest/java/org/dashj/x11/ExampleInstrumentedTest.java b/dashj-x11/src/androidTest/java/org/dashj/x11/ExampleInstrumentedTest.java deleted file mode 100644 index 761c7eb..0000000 --- a/dashj-x11/src/androidTest/java/org/dashj/x11/ExampleInstrumentedTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.dashj.x11; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("org.dashj.x11.test", appContext.getPackageName()); - } -} \ No newline at end of file diff --git a/dashj-x11/src/test/java/org/dashj/x11/X11Test.java b/dashj-x11/src/test/java/org/dashj/x11/X11Test.java deleted file mode 100644 index 20c6a09..0000000 --- a/dashj-x11/src/test/java/org/dashj/x11/X11Test.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dashj.x11; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class X11Test { - @Test - public void x11() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file