status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: use sha1 for status-go output filenameThis fixes issue with branch names containing slashes.Signed-off-by: Jakub Sokołowski <jakub@status.im> 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-07-29 14:23:32 -04:00
parent 6091517110
commit 0b1659fab9
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/react-native-status/android/build.gradle
View File

@ -1,13 +1,13 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
def getStatusGoVersion = { -> def getStatusGoSHA1 = { ->
def jsonSlurper = new groovy.json.JsonSlurper() def jsonSlurper = new groovy.json.JsonSlurper()
def content = new File('../status-go-version.json').text def content = new File('../status-go-version.json').text
def object = jsonSlurper.parseText(content) def object = jsonSlurper.parseText(content)
assert object instanceof Map assert object instanceof Map
return object.version return object.get('commit-sha1').substring(0, 7)
} }
android { android {
@ -25,5 +25,5 @@ dependencies {
implementation 'com.facebook.react:react-native:+' // from node_modules implementation 'com.facebook.react:react-native:+' // from node_modules
compile 'com.github.status-im:function:0.0.1' compile 'com.github.status-im:function:0.0.1'
implementation(group: 'status-im', name: 'status-go', version: getStatusGoVersion(), ext: 'aar') implementation(group: 'status-im', name: 'status-go', version: getStatusGoSHA1(), ext: 'aar')
} }

5
nix/status-go/default.nix
View File

@ -16,13 +16,14 @@ let
version = versionJSON.version; version = versionJSON.version;
sha256 = versionJSON.src-sha256; sha256 = versionJSON.src-sha256;
rev = versionJSON.commit-sha1; rev = versionJSON.commit-sha1;
shortRev = strings.substring 0 7 rev;
goPackagePath = "github.com/${owner}/${repo}"; goPackagePath = "github.com/${owner}/${repo}";
src = fetchFromGitHub { inherit rev owner repo sha256; name = "${repo}-${strings.substring 0 7 rev}-source"; }; src = fetchFromGitHub { inherit rev owner repo sha256; name = "${repo}-${shortRev}-source"; };
mobileConfigs = { mobileConfigs = {
android = { android = {
name = "android"; name = "android";
outputFileName = "status-go-${version}.aar"; outputFileName = "status-go-${shortRev}.aar";
envVars = [ envVars = [
"ANDROID_HOME=${androidPkgs.androidsdk}/libexec/android-sdk" "ANDROID_HOME=${androidPkgs.androidsdk}/libexec/android-sdk"
"ANDROID_NDK_HOME=${androidPkgs.ndk-bundle}/libexec/android-sdk/ndk-bundle" "ANDROID_NDK_HOME=${androidPkgs.ndk-bundle}/libexec/android-sdk/ndk-bundle"