Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sis 290 #184

Open
wants to merge 28 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
92f8adf
Set up CI with Azure Pipelines
situmops Jul 9, 2020
9c4c698
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 14, 2020
24dab1d
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 14, 2020
0cb1534
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 14, 2020
8bfb767
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
96287bd
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
766cb14
SIS-144: Disable github cocoapods download
o-iglesias Jul 15, 2020
854d165
Merge branch 'azure-pipelines' of https://github.com/situmtech/situm-…
o-iglesias Jul 15, 2020
82d8ec0
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
151883e
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
3a0d5a9
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
579dc06
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
8fcc8eb
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
0ed654d
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
84ab868
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
46833dd
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
0cb3239
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
4b9b0dd
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
4c56567
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
8ab0480
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
e085ac8
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
83cc471
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
685b274
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
384e4bf
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 15, 2020
c6a3155
Update azure-pipelines.yml for Azure Pipelines
situmops Jul 16, 2020
63e7bcb
Merge branch 'azure-pipelines' of https://github.com/situmtech/situm-…
o-iglesias Mar 2, 2021
3040f1e
SIS-290: Change repo.situm.es to repo.situm.com
o-iglesias Mar 2, 2021
77c41dc
Update compile and target SDKVersion to 30
Mar 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Starter pipeline
# Start with a minimal pipeline that you can customize to build and deploy your code.
# Add steps that build, run tests, deploy, and more:
# https://aka.ms/yaml

trigger:
- master
- master-release
- release/*
- develop
- feature/*

pr: none

variables:
- group: Passwords

resources:
containers:
- container: node_slim
image: node:11.12-slim

pool:
vmImage: 'ubuntu-latest'

jobs:

- job: Ios_job
pool:
vmImage: 'macOS-10.14'

steps:
- script: |
sudo xcode-select -switch /Applications/Xcode_11.3.1.app
mkdir -p /Users/runner/.cocoapods/repos/
wget https://github.com/CocoaPods/Specs/archive/master.zip
echo "########## UNZIPPING FILES ##########"
unzip -qq master.zip
echo -n "########## MOVING TO NEW FOLDER ##########"
mv Specs-master/Specs /Users/runner/.cocoapods/repos/
displayName: Add repo

- script: |
sudo xcode-select -switch /Applications/Xcode_11.3.1.app
tests/scripts/copy_ios_resources.sh
scripts/update_iosSDK_version.sh .
#cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2'
cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2'
displayName: iOS test


- job: Android_job

steps:
- script: |
cd src/android
./gradlew clean
displayName: Clean Android

- script: |
tests/scripts/copy_android_resources.sh
cd src/android && ./gradlew test --continue
displayName: Android test
- task: PublishTestResults@2
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: 'src/android/app/build/test-results/*/*.xml'
displayName: Publish test
condition: always()

- job: docker_job

steps:
- script: |
npm install
npm test
displayName: JS Test
target: node_slim

- script: |
npm run jsdoc
displayName: Generate JSDoc
target: node_slim

- script: |
zip -r JSDoc ./docs/JSDoc/*
displayName: Archive artifacts

- task: PublishBuildArtifacts@1
inputs:
pathToPublish: 'JSDoc.zip'
artifactName: 'JSDoc'
displayName: Archive





4 changes: 2 additions & 2 deletions src/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 30
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "es.plugin.situm"
minSdkVersion 22
targetSdkVersion 27
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion src/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ allprojects {
google()
jcenter()
maven {
url "https://repo.situm.es/artifactory/libs-release-local"
url "https://repo.situm.com/artifactory/libs-release-local"
}
maven {
url "https://maven.google.com"
Expand Down
2 changes: 1 addition & 1 deletion src/android/situm.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
repositories {
jcenter()
maven {
url "https://repo.situm.es/artifactory/libs-release-local"
url "https://repo.situm.com/artifactory/libs-release-local"
}
maven {
url "https://maven.google.com"
Expand Down
2 changes: 1 addition & 1 deletion src/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
target 'SitumCordovaPlugin' do
use_frameworks!
source 'https://github.com/CocoaPods/Specs.git'
#source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '9.0'
pod 'SitumSDK', '2.50.4'
end