m:修复publish.gradle中的错误,初步完成gcanvas_library的上传

Author: luckzhiwei

.gradle/5.1.1/executionHistory/executionHistory.bin

@@ -48,4 +48,4 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.ImageAdapter
 project.ext.meta.labels = ['Weex', 'ReactNative', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'Adapter']
 project.ext.meta.description = 'This package defines how to load images into bitmaps in GCanvas project.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"

.gradle/5.1.1/executionHistory/executionHistory.lock

@@ -39,4 +39,4 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.FrescoAdapter
 project.ext.meta.labels = ['Weex', 'ReactNative', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'Fresco', 'Image Loader']
 project.ext.meta.description = 'This package is the Fresco implemation of GCanvas image adapter.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"

.gradle/5.1.1/fileHashes/fileHashes.lock

@@ -36,4 +36,4 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.PicassoAdapter
 project.ext.meta.labels = ['Weex', 'ReactNative', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'Picasso', 'Image Loader']
 project.ext.meta.description = 'This package is the Picasso implemation of GCanvas image adapter.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"

.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -54,4 +54,4 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.BridgeSpec
 project.ext.meta.labels = ['Weex', 'ReactNative', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'Customize Own Bridge', 'Bridge Specification']
 project.ext.meta.description = 'This package defines native interfaces that a customize GCanvas bridge must implements.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"

android/adapters/bridge_adapter/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
-//group = rootProject.extensions.groups.Main
-//version = "1.1.0"
+group = rootProject.extensions.groups.Main
+version = "1.1.0"
 
 android {
     compileSdkVersion rootProject.extensions.sdks.CompileSDK
@@ -67,5 +67,5 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.Core
 project.ext.meta.labels = ['Weex', 'ReactNative', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'WebGL', 'Rendering', 'High Performance']
 project.ext.meta.description = 'This package defines GCanvas main library.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"
 

android/adapters/gcanvas_imageloader_fresco/build.gradle

@@ -44,9 +44,6 @@ public static void load() {
     }
 
 
-    /**
-     * 添加init callback
-     */
     synchronized public static void addGCanvasInitCallback(Runnable cb) {
         if (callbacks == null) {
             callbacks = new ArrayList<>();
@@ -127,9 +124,7 @@ synchronized private static void tryExecCallbacks() {
 
     public static native boolean sendEvent(String contextId);
 
-    /**
-     * 初始化font families
-     */
+
     public static void setFontFamilies() {
         GFontConfigParser parser = new GFontConfigParser();
         String fallbackFont = parser.getFallbackFont();

android/adapters/gcanvas_imageloader_picasso/build.gradle

@@ -1,10 +1,6 @@
 package com.taobao.gcanvas.util;
 
-/**
- * 供外部注入的java层 日志埋点相关接口
- * 支持trace()埋点 和 日志
- * Created by zhanqu on 2019/3/20.
- */
+
 public abstract class GCanvasTracer {
 
 

android/bridge_spec/build.gradle

@@ -14,7 +14,7 @@
 
 
 /**
- * log功能deprecated
+ *
  *
  */
 public class GLog {
@@ -38,20 +38,13 @@ public class GLog {
 
     public static void bindGCanvasTracer(GCanvasTracer tracer) {
         sGcanvasTracerClz = tracer;
-        // 获取tracer类名／方法名
         registerJavaTracer(tracer);
     }
 
 
-    /**
-     * 注册tracer
-     */
-    private static native void registerJavaTracer(GCanvasTracer tracer);
 
+    private static native void registerJavaTracer(GCanvasTracer tracer);
 
-    /**
-     * deprecated?
-     */
     public static void setLevel(String level) {
         if (level == null) {
             return;

android/gcanvas_library/build.gradle

@@ -47,4 +47,4 @@ dependencies {
 project.ext.id = rootProject.extensions.artifacts.WeexBridge
 project.ext.meta.labels = ['Weex', 'GPU', 'OpenGL', 'GCanvas', "canvas", 'WebGL', 'GCanvas Weex Bridge']
 project.ext.meta.description = 'This package defines GCanvas Weex bridge.'
-//apply from: "${rootProject.projectDir}/publish.gradle"
+apply from: "${rootProject.projectDir}/publish.gradle"

android/gcanvas_library/src/main/java/com/taobao/gcanvas/GCanvasJNI.java

@@ -88,7 +88,10 @@ dependencies {
     compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
     compile 'com.android.support:multidex:1.0.3'
     compile "com.taobao.android:weex_sdk:${rootProject.extensions.sdks.Weex}"
-    compile 'com.alibaba:fastjson:1.1.54.android'
+
+
+
+    
     compile 'com.taobao.android:weexplugin-annotation:1.3'
     compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
     compile 'com.taobao.android.weex_inspection:protocol:1.1.4.1'

android/gcanvas_library/src/main/java/com/taobao/gcanvas/util/GCanvasTracer.java

@@ -64,7 +64,7 @@ rootProject.extensions.groups = [
 // Artifact IDs
 rootProject.extensions.artifacts = [
         'BridgeSpec'    : 'spec',
-        'Core'          : 'core',
+        'Core'          : 'gcanvas_library',
         'WeexBridge'    : 'weex',
         'ReactNative'   : 'rn',
         'ImageAdapter'  : 'img',

android/gcanvas_library/src/main/java/com/taobao/gcanvas/util/GLog.java

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 project.ext.meta.vcsUrl = "https://github.com/alibaba/GCanvas.git"
-
+version = project.version
 buildscript {
     repositories {
         //本地库，local repository(${user.home}/.m2/repository)
@@ -73,15 +73,13 @@ def pomConfig = {
 }
 
 publishing {
-    println("$buildDir/outputs/aar/${project.name}-release.aar")
+    println("$buildDir/outputs/aar/${project.name}-${version}.aar")
     publications {
         maven(MavenPublication) {
             groupId group
             artifactId project.ext.id
             version version
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-            artifact sourcesJar
-            println("group id is"+groupId)
+            println("${group}:${project.ext.id}:${version}")
             pom.withXml {
                 def dependenciesNode = asNode().appendNode('dependencies')
 
@@ -123,24 +121,21 @@ artifacts {
     archives androidJavadocsJar
 }
 
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+//上传到jcenter
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
-    publications = ['maven']
+bintray {
+    user = properties.getProperty("bintray.user")    //读取 local.properties 文件里面的 bintray.user
+    key = properties.getProperty("bintray.apikey")   //读取 local.properties 文件里面的 bintray.apikey
+    configurations = ['archives']
     pkg {
         repo = "GCanvas"
         name = "${project.group}:${project.ext.id}"
-        userOrg = user
+        userOrg = properties.getProperty("bintray.userOrg")
         licenses = ['Apache-2.0']
         websiteUrl = "https://g-platform.github.io"
         vcsUrl = project.ext.meta.vcsUrl
         labels = project.ext.meta.labels
-        publicDownloadNumbers = true
-        version {
-            name = project.version
-            desc = project.ext.meta.description
-            vcsTag = project.version
-        }
     }
 }