Fix/build (#93)

* Fix unresolved jcenter deps * Bump version * Fix/build_new_dep (#94) * update java version * change ndk instalation * fix: shell property * update ndk version * link ndk * update ndk version setup * fix path * fix ndk assignement --------- Co-authored-by: Stepan Lavrentev <[email protected]>
novasamatech · Aug 15, 2024 · eb9e234 · eb9e234
1 parent 33b62a8
commit eb9e234
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml
@@ -7,13 +7,18 @@ runs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '8'
+        java-version: '11'
         cache: 'gradle'
 
-    - uses: nttld/setup-ndk@v1
+    - name: 🛠️ Install NDK
+      id: setup-ndk
+      uses: nttld/setup-ndk@v1
       with:
-        ndk-version: r21d
-        local-cache: true
+        ndk-version: 'r25c'
+
+    - name: Set ndk.dir in local.properties
+      run: echo "ndk.dir=${{ steps.setup-ndk.outputs.ndk-path }}" >> local.properties
+      shell: bash
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1

diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
     ext {
         // App version
-        versionName = '2.1.2'
+        versionName = '2.1.3'
         versionCode = 1
 
         // SDK and tools
         compileVersion = 28
         minVersion = 21
         targetVersion = 28
 
-        kotlinVersion = '1.4.31'
+        kotlinVersion = '1.6.20'
 
         supportVersion = '1.0.0'
         constraintVersion = '1.1.3'
@@ -23,7 +23,6 @@ buildscript {
 
         spoungyCastleVersion = '1.58.0.0'
         ed25519Version = '0.3.0'
-        bip39version = '2019.01.27'
         web3jVersion = '4.8.0'
         apacheXercesVersion = '2.9.0'
 
@@ -48,8 +47,8 @@ buildscript {
         web3jDep = "org.web3j:crypto:$web3jVersion"
         apacheXercesDep = "org.eclipse.birt.runtime.3_7_1:org.apache.xerces:$apacheXercesVersion"
 
-        bip39Dep = "io.github.novacrypto:BIP39:$bip39version"
-        secureStringDep = "io.github.novacrypto:securestring:$bip39version@jar"
+        secureStringDep = "io.github.novacrypto:SecureString:2022.01.17@jar"
+
         wsDep = "com.neovisionaries:nv-websocket-client:$wsVersion"
         xxHashDep = "org.lz4:lz4-java:$xxHashVersion"
         svgDep = "com.caverock:androidsvg-aar:$svgVersion"
@@ -71,8 +70,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
-        classpath 'org.mozilla.rust-android-gradle:plugin:0.9.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'org.mozilla.rust-android-gradle:plugin:0.9.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
     }
@@ -88,7 +87,6 @@ allprojects {
         maven {
             url "https://jitpack.io"
         }
-        mavenCentral()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/substrate-sdk-android/build.gradle b/substrate-sdk-android/build.gradle
@@ -72,17 +72,25 @@ dependencies {
     implementation bouncyCastleDep
     implementation ed25519Dep
     implementation svgDep
-    implementation bip39Dep
-    implementation secureStringDep
     implementation wsDep
+    implementation secureStringDep
     implementation gsonDep
     implementation web3jDep
-    implementation gsonDep
     implementation apacheXercesDep
     implementation xxHashDep
 
     implementation coroutinesDep
 
+    // See https://github.com/NovaCrypto/BIP39/issues/43
+    implementation("com.github.NovaCrypto:BIP39:0e7fa95f80") {
+        exclude group: "io.github.novacrypto", module: "ToRuntime"
+        exclude group: "io.github.novacrypto", module: "SHA256"
+    }
+    implementation("com.github.NovaCrypto:Sha256:57bed72da5") {
+        exclude group: "io.github.novacrypto", module: "ToRuntime"
+    }
+    implementation "com.github.NovaCrypto:ToRuntime:c3ae3080eb"
+
     testImplementation jUnitDep
     testImplementation mockitoDep
     testImplementation project(':substrate-sdk-android')