update CI

xsolla · Nov 3, 2020 · 830c881 · 830c881
1 parent 48ca51a
commit 830c881
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 30 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,14 +16,14 @@ before_script:
 
 build:
   tags:
-    - devops
+    - sdk
   stage: build
   except:
     - branches
   script:
     - ./gradlew assembleDebug
   artifacts:
-    expire_in: 4 hours
+    expire_in: 2 hours
     paths:
       - app/build/outputs/
       - app-playfab/build/outputs/
@@ -35,7 +35,7 @@ build:
 
 test:
   tags:
-    - devops
+    - sdk
   stage: test
   except:
     - branches
@@ -48,7 +48,7 @@ test:
 
 generateDebugApp:
   tags:
-    - devops
+    - sdk
   stage: publish
   except:
     - branches
@@ -64,21 +64,56 @@ generateDebugApp:
     - mv app-playfab/build/outputs/apk/debug/app-playfab-debug.apk ./artifacts/SampleApp-Playfab.apk
     - mv app-simplified/build/outputs/apk/debug/app-simplified-debug.apk ./artifacts/SampleApp-Simplified.apk
   artifacts:
-    expire_in: 3 days
+    expire_in: 2 hours
     paths:
       - artifacts
 
-bintrayUpload:
+publishLogin:
   tags:
-    - devops
+    - sdk
   stage: publish
   when: manual
   only:
     - /^v.*/
   except:
     - branches
   script:
-    - ./gradlew bintrayUpload
+    - ./gradlew :xsolla-login-sdk:bintrayUpload
+    - ./gradlew :xsolla-login-sdk-facebook:bintrayUpload
+    - ./gradlew :xsolla-login-sdk-google:bintrayUpload
+  cache:
+    key: ${CI_PROJECT_ID}
+    paths:
+      - .gradle/*
+
+publishStore:
+  tags:
+    - sdk
+  stage: publish
+  when: manual
+  only:
+    - /^v.*/
+  except:
+    - branches
+  script:
+    - ./gradlew :xsolla-store-sdk:bintrayUpload
+  cache:
+    key: ${CI_PROJECT_ID}
+    paths:
+      - .gradle/*
+
+publishPayments:
+  tags:
+    - sdk
+  stage: publish
+  when: manual
+  only:
+    - /^v.*/
+  except:
+    - branches
+  script:
+    - ./gradlew :xsolla-payments-sdk:bintrayUpload
+    - ./gradlew :xsolla-payments-sdk-playfab:bintrayUpload
   cache:
     key: ${CI_PROJECT_ID}
     paths:

diff --git a/app-core/build.gradle b/app-core/build.gradle
@@ -11,8 +11,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode sample_app_version_code
+        versionName sample_app_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app-playfab/build.gradle b/app-playfab/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.xsolla.android.playfabexample"
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode sample_app_version_code
+        versionName sample_app_version_name
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
 

diff --git a/app-simplified/build.gradle b/app-simplified/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.xsolla.android.simplifiedexample"
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode sample_app_version_code
+        versionName sample_app_version_name
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.xsolla.android.storesdkexample"
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode sample_app_version_code
+        versionName sample_app_version_name
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
 

diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,17 @@
 
 buildscript {
 
-    ext.sdk_version_name = '0.14.0'
-    ext.sdk_version_code = 8
+    ext.payments_sdk_version_name = '0.14.0'
+    ext.payments_sdk_version_code = 8
+
+    ext.store_sdk_version_name = '0.15.0'
+    ext.store_sdk_version_code = 9
+
+    ext.login_sdk_version_name = '1.0.0'
+    ext.login_sdk_version_code = 9
+
+    ext.sample_app_version_name = '1.0.0'
+    ext.sample_app_version_code = 9
 
     ext.sdk_min = 21
     ext.sdk_target = 29

diff --git a/xsolla-login-sdk-facebook/build.gradle b/xsolla-login-sdk-facebook/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode login_sdk_version_code
+        versionName login_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/xsolla-login-sdk-google/build.gradle b/xsolla-login-sdk-google/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode login_sdk_version_code
+        versionName login_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/xsolla-login-sdk/build.gradle b/xsolla-login-sdk/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode login_sdk_version_code
+        versionName login_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/xsolla-payments-sdk-playfab/build.gradle b/xsolla-payments-sdk-playfab/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode payments_sdk_version_code
+        versionName payments_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/xsolla-payments-sdk/build.gradle b/xsolla-payments-sdk/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode payments_sdk_version_code
+        versionName payments_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/xsolla-store-sdk/build.gradle b/xsolla-store-sdk/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion sdk_min
         targetSdkVersion sdk_target
-        versionCode sdk_version_code
-        versionName sdk_version_name
+        versionCode store_sdk_version_code
+        versionName store_sdk_version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'