diff --git a/app/build.gradle b/app/build.gradle index e596d1c..350711b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: ly.count.android.plugins.UploadSymbolsPlugin android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -79,8 +80,35 @@ dependencies { annotationProcessor 'com.elegant.spi:compiler:1.0.3' //编译时库 -// implementation 'ly.count.android:sdk:24.4.1' -// implementation 'ly.count.android:sdk-native:24.4.1' - implementation project(":libraries:countly:sdk") - implementation project(":libraries:countly:sdk-native") + implementation 'com.mogo.cloud:countly-sdk:1.4.7.49.18-debug' + implementation 'com.mogo.cloud:countly-sdk-native:1.4.7.49.18-debug' +// implementation project(":libraries:countly:sdk") +// implementation project(":libraries:countly:sdk-native") +} + + +countly { + // required by both tasks + server "http://countly.zhidaozhixing.com" + // same app_key used for SDK integration + app_key "45cccb4a005ca14b79fca7d24b69e1a67730e325" + + // location of mapping.txt file relative to project build directory + mappingFile "outputs/mapping/release/mapping.txt" + + // note that will be saved with the upload and can be checked in the UI + noteJava "sdk-plugin automatic upload of mapping.txt" + + // optional properties for uploadNativeSymbols. Shown are the default values. + + // directory of .so files relative to project build directory. + // you can check the tar.gz file created under intermediates/countly + // BUILD_TYPE could be debug or release + nativeObjectFilesDir "intermediates/merged_native_libs/BUILD_TYPE" + + // path for breakpad tool dump_syms executable + dumpSymsPath "/usr/bin" + + // note that will be saved with the upload and can be checked in the UI + noteNative "sdk-plugin automatic upload of breakpad symbols" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 994ec12..b0abc0e 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files // classpath 'ly.count.android:sdk-plugin:24.4.1' - classpath group: 'com.mogo.cloud', 'name': 'sdk-plugin', 'version': '1.4.7.42' + classpath group: 'com.mogo.cloud', 'name': 'upload-plugin', 'version': '1.4.7.49.18-debug' } diff --git a/gradle.properties b/gradle.properties index 471a78f..6104b74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,6 +59,10 @@ MOGO_TELEMATIC_VERSION=1.4.7.42 MOGO_V2X_VERSION=1.4.7.42 # SKIN MOGO_SKIN_VERSION=1.4.7.49.18-debug +# SDK +SDK_VERSION=1.4.7.49.18-debug +SDK_NATIVE_VERSION=1.4.7.49.18-debug +UPLOAD_PLUGIN_VERSION=1.4.7.49.18-debug diff --git a/gradle/upload.gradle b/gradle/upload.gradle index 908c41b..bd96684 100644 --- a/gradle/upload.gradle +++ b/gradle/upload.gradle @@ -3,7 +3,7 @@ apply plugin: 'maven-publish' task loggerSourcesJar(type: Jar) { classifier = 'sources' - from android.sourceSets.main.java.srcDirs +// from android.sourceSets.main.java.srcDirs // if (plugins.hasPlugin("java-library")) { // from sourceSets.main.java.srcDirs // } diff --git a/libraries/countly/app-native/build.gradle b/libraries/countly/app-native/build.gradle index 463bbe2..cba80fb 100644 --- a/libraries/countly/app-native/build.gradle +++ b/libraries/countly/app-native/build.gradle @@ -40,10 +40,10 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.0' - implementation project(':libraries:countly:sdk') - //implementation 'ly.count.android:sdk:21.11.0' - implementation project(':libraries:countly:sdk-native') - //implementation 'ly.count.android:sdk-native:21.11.0' +// implementation project(':libraries:countly:sdk') + implementation 'com.mogo.cloud:countly-sdk:1.4.7.49.18-debug' +// implementation project(':libraries:countly:sdk-native') + implementation 'com.mogo.cloud:countly-sdk-native:1.4.7.49.18-debug' } diff --git a/libraries/countly/app/build.gradle b/libraries/countly/app/build.gradle index 59667fe..9df8954 100644 --- a/libraries/countly/app/build.gradle +++ b/libraries/countly/app/build.gradle @@ -50,7 +50,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation project(':libraries:countly:sdk') +// implementation project(':libraries:countly:sdk') + implementation 'com.mogo.cloud:countly-sdk:1.4.7.49.18-debug' //implementation 'ly.count.android:sdk:21.11.0' //implementation 'ly.count.android:sdk-plugin:21.11.0' diff --git a/libraries/countly/sdk-native/build.gradle b/libraries/countly/sdk-native/build.gradle index 822e9ee..d0a452e 100644 --- a/libraries/countly/sdk-native/build.gradle +++ b/libraries/countly/sdk-native/build.gradle @@ -37,3 +37,5 @@ tasks.whenTaskAdded { task -> task.dependsOn('copyLibs') } } + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/countly/sdk-native/gradle.properties b/libraries/countly/sdk-native/gradle.properties index 54cec37..36c2c58 100644 --- a/libraries/countly/sdk-native/gradle.properties +++ b/libraries/countly/sdk-native/gradle.properties @@ -1,6 +1,5 @@ #RELEASE FIELDS -POM_ARTIFACT_ID=sdk-native - -POM_NAME=Countly Android SDK native crash integration -POM_DESCRIPTION=Countly Android Native Crash Support -POM_INCEPTION_YEAR=2019 \ No newline at end of file +GROUP=com.mogo.cloud +POM_ARTIFACT_ID=countly-sdk-native +VERSION_CODE=1 +VERSION_NAME=1.0.9-SNAPSHOT \ No newline at end of file diff --git a/libraries/countly/sdk/build.gradle b/libraries/countly/sdk/build.gradle index 4a6ec59..72693d9 100644 --- a/libraries/countly/sdk/build.gradle +++ b/libraries/countly/sdk/build.gradle @@ -53,3 +53,5 @@ dependencies { //required for as long the min SDK version is smaller than 21 } + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/countly/sdk/gradle.properties b/libraries/countly/sdk/gradle.properties index dd8284f..3a8dd2b 100644 --- a/libraries/countly/sdk/gradle.properties +++ b/libraries/countly/sdk/gradle.properties @@ -1,5 +1,5 @@ #RELEASE FIELDS -POM_ARTIFACT_ID=sdk -POM_NAME=Countly Android SDK -POM_DESCRIPTION=Android SDK for Countly mobile analytics -POM_INCEPTION_YEAR=2015 \ No newline at end of file +GROUP=com.mogo.cloud +POM_ARTIFACT_ID=countly-sdk +VERSION_CODE=1 +VERSION_NAME=1.0.9-SNAPSHOT \ No newline at end of file diff --git a/libraries/countly/upload-plugin/build.gradle b/libraries/countly/upload-plugin/build.gradle index 1e37cf9..f7473ba 100644 --- a/libraries/countly/upload-plugin/build.gradle +++ b/libraries/countly/upload-plugin/build.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0' //for publishing - } -} - plugins { id 'java-gradle-plugin' id 'groovy' @@ -21,9 +12,6 @@ gradlePlugin { } } -repositories { - mavenCentral() -} dependencies { implementation gradleApi() @@ -31,14 +19,4 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.14.9' } -apply plugin: "com.vanniktech.maven.publish" - -publishing { - repositories { - maven { - name = "ZhiDaoAuto" - url = "https://nexus.zhidaoauto.com/repository/maven-releases/" - credentials(PasswordCredentials.class) - } - } -} \ No newline at end of file +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/countly/upload-plugin/gradle.properties b/libraries/countly/upload-plugin/gradle.properties index e1195e9..0e8e88b 100644 --- a/libraries/countly/upload-plugin/gradle.properties +++ b/libraries/countly/upload-plugin/gradle.properties @@ -1,5 +1,4 @@ -#RELEASE FIELDS -POM_ARTIFACT_ID=sdk-plugin -POM_NAME=Countly Android SDK symbol upload plugin -POM_DESCRIPTION=Gradle plugin for automatic upload of symbol files -POM_INCEPTION_YEAR=2019 \ No newline at end of file +GROUP=com.mogo.cloud +POM_ARTIFACT_ID=countly-upload-plugin +VERSION_CODE=1 +VERSION_NAME=1.0.9-SNAPSHOT \ No newline at end of file