From 23fbb11a0dc0c61a00465bd811bd83a742d59dab Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sat, 6 Nov 2021 20:59:13 -0700 Subject: [PATCH 01/21] chore: add github actions --- .github/workflows/tests.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..82e6310 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,25 @@ +# 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: Build + run: ./gradlew assemble From 49b4a065caedebe79485b1732a7eca7418692c81 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sat, 6 Nov 2021 21:31:33 -0700 Subject: [PATCH 02/21] build: update publishing authentication for dashj-bls --- dashj-bls/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashj-bls/build.gradle b/dashj-bls/build.gradle index 4dc23b0..aeab875 100644 --- a/dashj-bls/build.gradle +++ b/dashj-bls/build.gradle @@ -93,11 +93,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 { From 16677626b78adee7a4efb19a10a61dae2cbab132 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sat, 6 Nov 2021 21:41:51 -0700 Subject: [PATCH 03/21] build: update publishing authentication for dashj-scrypt/xll --- dashj-scrypt/build.gradle | 4 ++-- dashj-x11/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/build.gradle b/dashj-x11/build.gradle index adb10b0..04b4dfe 100644 --- a/dashj-x11/build.gradle +++ b/dashj-x11/build.gradle @@ -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 { From c1055b3f7b4e524c3b23301ccc3de830a97ba1e3 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 20:24:13 -0800 Subject: [PATCH 04/21] chore: add ndk version to build.gradle --- dashj-bls/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dashj-bls/build.gradle b/dashj-bls/build.gradle index aeab875..ad73469 100644 --- a/dashj-bls/build.gradle +++ b/dashj-bls/build.gradle @@ -48,6 +48,8 @@ android { path 'cpp/CMakeLists.txt' } } + + ndkVersion "21.1.6352462" } version '0.18.1' From 9d9f1dec55540d20931604c4f15b5259e231ac25 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:30:37 -0800 Subject: [PATCH 05/21] docs: Update README.md --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 From b6750245d78731e07c3fd1a6c2d8d2b35036d7d5 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:32:15 -0800 Subject: [PATCH 06/21] chore: add junit 4.13.2 to dashj-scrypt --- dashj-x11/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashj-x11/build.gradle b/dashj-x11/build.gradle index 04b4dfe..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) { From 493d3527592ded70e9d4c5be892426d0310aea82 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:33:36 -0800 Subject: [PATCH 07/21] chore: remove jcenter references --- build.gradle | 3 --- dashj-bls/build.gradle | 1 - 2 files changed, 4 deletions(-) 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 ad73469..a3e5f1f 100644 --- a/dashj-bls/build.gradle +++ b/dashj-bls/build.gradle @@ -61,7 +61,6 @@ dependencies { repositories { mavenLocal() mavenCentral() - jcenter() } task javadoc(type: Javadoc) { From 4bcd5de2d82e29f7957f3c3a98a20b10ed062a93 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:34:17 -0800 Subject: [PATCH 08/21] chore: remove kotlin --- dashj-bls/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/dashj-bls/build.gradle b/dashj-bls/build.gradle index a3e5f1f..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 From 3624479bd1b0598654dd36757525bb89e8f6a7e7 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:50:51 -0800 Subject: [PATCH 09/21] chore: ignore .cxx folders --- dashj-scrypt/.gitignore | 3 ++- dashj-x11/.gitignore | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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-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 From 8ef055992cdfc58fe8a9662b77f84e1251fdc32e Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:51:08 -0800 Subject: [PATCH 10/21] chore: remove unneeded test files --- .../res/drawable/ic_android_black_24dp.xml | 9 ------- .../dashj/x11/ExampleInstrumentedTest.java | 25 ------------------- .../src/test/java/org/dashj/x11/X11Test.java | 17 ------------- 3 files changed, 51 deletions(-) delete mode 100644 dashj-bls/src/main/res/drawable/ic_android_black_24dp.xml delete mode 100644 dashj-x11/src/androidTest/java/org/dashj/x11/ExampleInstrumentedTest.java delete mode 100644 dashj-x11/src/test/java/org/dashj/x11/X11Test.java 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-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 From cec63d8bacf94086529de9778e4eac172631473a Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 21:59:00 -0800 Subject: [PATCH 11/21] chore: test will build Release --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 82e6310..f6b6f7e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,4 +22,4 @@ jobs: run: | $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - name: Build - run: ./gradlew assemble + run: ./gradlew assembleRelease From 18d62b5904371a74a2a669407b5181667e2fa036 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:05:41 -0800 Subject: [PATCH 12/21] chore: install cmake --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6b6f7e..662722c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,5 +21,6 @@ jobs: - name: Install NDK run: | $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 + $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2" --channel=0 - name: Build run: ./gradlew assembleRelease From d1cad7a5f2a6aa42935ccb218ec31d3d8c98cea2 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:11:31 -0800 Subject: [PATCH 13/21] chore: install cmake (add action) --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 662722c..8794d66 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,6 +21,7 @@ jobs: - name: Install NDK run: | $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2" --channel=0 + - name: Get specific version CMake, v3.21.2 + uses: lukka/get-cmake@v3.10.2 ⟸ THIS IS THE ONE LINER YOU NEED - name: Build run: ./gradlew assembleRelease From 8f47a68cb762b23323dbe8e7b98b048ac067b118 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:13:06 -0800 Subject: [PATCH 14/21] chore: install cmake (add action) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8794d66..f701d9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,6 @@ jobs: run: | $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - name: Get specific version CMake, v3.21.2 - uses: lukka/get-cmake@v3.10.2 ⟸ THIS IS THE ONE LINER YOU NEED + uses: lukka/get-cmake@v3.21.2 ⟸ THIS IS THE ONE LINER YOU NEED - name: Build run: ./gradlew assembleRelease From f62d4744914c8389e0f8c05826ae2183cd86986e Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:14:05 -0800 Subject: [PATCH 15/21] chore: install cmake (add action) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f701d9f..e671b54 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,6 @@ jobs: run: | $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - name: Get specific version CMake, v3.21.2 - uses: lukka/get-cmake@v3.21.2 ⟸ THIS IS THE ONE LINER YOU NEED + uses: lukka/get-cmake@v3.21.2 - name: Build run: ./gradlew assembleRelease From ecf6bf1584f0933c1020cb0168d67dbd8814ca58 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:15:58 -0800 Subject: [PATCH 16/21] chore: remove specific ndk --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e671b54..92c01c7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,9 +18,9 @@ jobs: # 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: Install NDK + # run: | + # $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - name: Get specific version CMake, v3.21.2 uses: lukka/get-cmake@v3.21.2 - name: Build From fefe440da02f5eafcdad2e8284091e28defd8280 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:22:56 -0800 Subject: [PATCH 17/21] chore: show debug info --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 92c01c7..9772f60 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,4 +24,4 @@ jobs: - name: Get specific version CMake, v3.21.2 uses: lukka/get-cmake@v3.21.2 - name: Build - run: ./gradlew assembleRelease + run: ./gradlew assembleRelease --debug From 1b9508e27109f54b7f1fb640e18246370084774a Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:28:08 -0800 Subject: [PATCH 18/21] chore: change cmake setup --- .github/workflows/tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9772f60..06a66f8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,9 @@ jobs: #- name: Install NDK # run: | # $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - - name: Get specific version CMake, v3.21.2 - uses: lukka/get-cmake@v3.21.2 + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.9 + with: + cmake-version: '3.10.2' - name: Build run: ./gradlew assembleRelease --debug From 7f150c18d6d7ec13806b3ff2b380b41f574ca314 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:40:21 -0800 Subject: [PATCH 19/21] chore: change cmake setup --- .github/workflows/tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 06a66f8..316c1ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,8 +22,6 @@ jobs: # run: | # $ANDROID_HOME/tools/bin/sdkmanager --install "ndk;21.3.6528147" --channel=0 - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.9 - with: - cmake-version: '3.10.2' + run: $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2" --channel=0 - name: Build run: ./gradlew assembleRelease --debug From 57f882af1634ebadf5eb3f3fab7e85fb9834601d Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 14 Nov 2021 22:42:43 -0800 Subject: [PATCH 20/21] chore: change cmake setup version --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 316c1ae..8e86979 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,6 @@ jobs: # 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" --channel=0 + run: $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2.4988404" --channel=0 - name: Build run: ./gradlew assembleRelease --debug From 66a43d8797f922f62d27afd14c4adefc8f8e2f5a Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Fri, 28 Oct 2022 22:03:42 -0700 Subject: [PATCH 21/21] chore: remove debug on assemble --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e86979..64bc326 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,4 +24,4 @@ jobs: - name: Setup cmake run: $ANDROID_HOME/tools/bin/sdkmanager --install "cmake;3.10.2.4988404" --channel=0 - name: Build - run: ./gradlew assembleRelease --debug + run: ./gradlew assembleRelease