Fixed suffix bug (#45)

5afe · Dec 11, 2017 · a6600ef · a6600ef
1 parent 137068d
commit a6600ef
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/bivrost-gradle-plugin/src/main/kotlin/pm/gnosis/plugin/BivrostPlugin.kt b/bivrost-gradle-plugin/src/main/kotlin/pm/gnosis/plugin/BivrostPlugin.kt
@@ -58,7 +58,7 @@ class BivrostPlugin : Plugin<Project> {
                         inputs.files(abiFolder.listFiles())
 
                         doLast {
-                            val packageName = variant.applicationId
+                            val packageName = variant.applicationId.removeSuffix(variant.buildType.applicationIdSuffix ?: "")
                             // We can reuse arrays for all ABIs
                             val arraysMap = AbiParser.ArraysMap(packageName)
 

diff --git a/bivrost-solidity-types-generator/build.gradle b/bivrost-solidity-types-generator/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven'
 sourceCompatibility = 1.8
 
 task runSolidityTypeGenerator(type: JavaExec) {
-    def targetProject = project.parent.childProjects.get("bivrost-solidity-types") ?: this
+    def targetProject = project.parent.childProjects.get("bivrost-solidity-types") ?: project
     def srcDirs = targetProject.sourceSets.main.kotlin.getSrcDirs()
     if (srcDirs.isEmpty()) {
         logger.error("Couldn't find kotlin main source sets")

diff --git a/build.gradle b/build.gradle
@@ -2,12 +2,12 @@ buildscript {
     ext.versions = [
             'minSdk'       : 14,
             'compileSdk'   : 27,
-            'buildTools'   : '27.0.1',
+            'buildTools'   : '27.0.2',
 
-            'kotlin'       : '1.1.60',
+            'kotlin'       : '1.2.0',
             'kotlinPoet'   : '0.6.0',
             'moshi'        : '1.5.0',
-            'androidPlugin': '3.1.0-alpha03',
+            'androidPlugin': '3.1.0-alpha05',
     ]
 
     ext.deps = [

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 18 21:20:02 CEST 2017
+#Mon Dec 11 12:02:10 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-4.4-20171031235950+0000-all.zip
diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -45,6 +45,8 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
             minifyEnabled false
         }
     }

diff --git a/sample/app/src/main/java/com/example/abiparser/MainActivity.kt b/sample/app/src/main/java/com/example/abiparser/MainActivity.kt
@@ -7,5 +7,6 @@ import android.os.Bundle
 class MainActivity: Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EtherToken.Name.encode()
     }
 }