Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation

2026-11-02 17:19:37 +00:00 · 2015-10-02 12:26:35 +02:00
commit eec6645f46
@@ -41,4 +41,8 @@ ext {
    // testing - ui
    test = "0.2"
    espresso = "2.1"
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.6'
 }
@@ -624,14 +624,18 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
 	        ANDROID="$ANDROID_HOME/tools/android.bat"
 	    fi

-        RC_APP_VERSION=`grep "android:versionCode=" mobile/com.sap.$PROJECT_TYPE.racecommittee.app/AndroidManifest.xml | cut -d "\"" -f 2`
+        RC_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.racecommittee.app/build.gradle | cut -d "=" -f 2`
        echo "RC_APP_VERSION=$RC_APP_VERSION"
        extra="$extra -Drc-app-version=$RC_APP_VERSION"

-        TRACKING_APP_VERSION=`grep "android:versionCode=" mobile/com.sap.$PROJECT_TYPE.android.tracking.app/AndroidManifest.xml | cut -d "\"" -f 2`
+        TRACKING_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.android.tracking.app/build.gradle | cut -d "=" -f 2`
        echo "TRACKING_APP_VERSION=$TRACKING_APP_VERSION"
        extra="$extra -Dtracking-app-version=$TRACKING_APP_VERSION"

+        BUOY_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.buoy.positioning/build.gradle | cut -d "=" -f 2`
+        echo "BUOY_APP_VERSION=$BUOY_APP_VERSION"
+        extra="$extra -Dbuoy-app-version=$BUOY_APP_VERSION"
+
        NOW=$(date +"%s")
        BUILD_TOOLS=22.0.1
        TARGET_API=22
@@ -8,6 +8,7 @@ export EC2_HOME=/opt/amazon/ec2-api-tools-1.6.8.0
 export EC2_URL=https://ec2.eu-west-1.amazonaws.com
 export JAVA_HOME=/opt/jdk1.8.0_45
 export JAVA_1_7_HOME=/opt/jdk1.7.0_75
+export ANDROID_HOME=/opt/android-sdk-linux

 export PATH=$PATH:$JAVA_HOME/bin:/opt/amazon/ec2-api-tools-1.6.8.0/bin:/opt/amazon/bin

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+command -v tmux >/dev/null 2>&1 || { echo "I require tmux but it's not installed. Aborting." >&2; exit 1; }
+
+sn=sailing
+
+SERVERS_DIR=/home/sailing/servers
+
+TMUX_ACTIVE=`tmux has-session -t $sn 2>/dev/null`
+if [ $? -eq 0 ]; then
+        echo "Session exists...not configuring a new one"
+else
+        echo "Session does not exist...creating a new one with name $sn"
+        cd /home/sailing/code
+        tmux new-session -s "$sn" -n "BUILD" -d
+
+        counter=0
+
+        cd $SERVERS_DIR
+        tmux new-window -t "$sn:$[counter+1]" -n "GOAccess" "bash -c 'goaccess -f /var/log/httpd/access_log'; bash"
+
+        cd $SERVERS_DIR
+        tmux new-window -t "$sn:$[counter+2]" -n "ATop" "bash -c 'apachetop -f /var/log/httpd/access_log'; bash"
+
+        cd $SERVERS_DIR
+        tmux new-window -t "$sn:$[counter+3]" -n "Htop" "bash -c 'htop'; bash"
+
+        cd $SERVERS_DIR/server/logs
+        tmux new-window -t "$sn:$[counter+4]" -n "Logs" "bash -c 'ls -lah'; bash"
+
+        cd $SERVERS_DIR
+        tmux new-window -t "$sn:$[counter+5]" -n "LeaderboardCalc" "bash -c 'tail -f server/logs/sailing0.log.0 | grep took'; bash"
+
+        tmux select-window -t "$sn:0"
+fi
+
+if [[ "$1" != "unattended" ]]; then
+        tmux -2 attach-session -t "$sn"
+fi
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Aug 24 09:27:12 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
@@ -23,6 +23,7 @@ SAP is at the center of today’s technology revolution, developing innovations
  * [[Web Services API|wiki/sailing-webservices]]
  * [[Theses (Bachelor, Master, ...)|wiki/theses]]
  * [[Google Analytics (Web Page Tracking)|wiki/ganalytics]]
+  * [[Polars|wiki/Polars]]
 * Production Environment
  * [[Amazon EC2|wiki/amazon-ec2]]
  * [[EC2 Backup Strategy|wiki/amazon-ec2-backup-strategy]]
@@ -68,6 +69,8 @@ SAP is at the center of today’s technology revolution, developing innovations
  * [[Travem&uuml;nder Woche 2014 event page|wiki/tw2014]]
  * [[505 worlds Kiel 2014 event page|wiki/505-worlds-kiel-2014]]
  * [[Kieler Woche event page|wiki/kieler-woche-2015]]
+* Lean DI Support
+  * [[Setting up internal Jenkins on SAP Monsoon|wiki/setting-up-jenkins-on-sap-monsoon]]

 ### Internal services (not related to wiki but useful)

@@ -76,7 +79,6 @@ SAP is at the center of today’s technology revolution, developing innovations
 * [Maven Repository Browser](http://maven.sapsailing.com/maven/) (see [[how to setup repository for Android builds|wiki/racecommittee-app-environment]])
 * [Main Sailing Website](http://www.sapsailing.com)
 * [Visitor Statistics](http://analysis.sapsailing.com/)
-* [Traffic and CPU for app01](http://mrtg.sapsailing.com/)

 ### TracTrac Workshop in Kopenhagen

@@ -1 +0,0 @@
-../../../AFNetworkActivityLogger/AFNetworkActivityLogger/AFNetworkActivityLogger.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFHTTPRequestOperation.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFHTTPSessionManager.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFSecurityPolicy.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFURLConnectionOperation.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFURLRequestSerialization.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFURLResponseSerialization.h
@@ -1 +0,0 @@
-../../../AFNetworking/AFNetworking/AFURLSessionManager.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
@@ -1 +0,0 @@
-../../../AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
@@ -1,5 +0,0 @@
-#include "Pods-AFNetworkActivityLogger.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Build" "${PODS_ROOT}/Headers/Build/AFNetworkActivityLogger" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_LDFLAGS = -ObjC
-PODS_ROOT = ${SRCROOT}
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_AFNetworkActivityLogger : NSObject
-@end
-@implementation PodsDummy_Pods_AFNetworkActivityLogger
-@end
@@ -1,5 +0,0 @@
-#include "Pods-AFNetworking.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Build" "${PODS_ROOT}/Headers/Build/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_LDFLAGS = ${PODS_AFNETWORKING_OTHER_LDFLAGS} -ObjC
-PODS_ROOT = ${SRCROOT}
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_AFNetworking : NSObject
-@end
-@implementation PodsDummy_Pods_AFNetworking
-@end
@@ -1 +0,0 @@
-PODS_AFNETWORKING_OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
@@ -1,60 +0,0 @@
-
-// To check if a library is compiled with CocoaPods you
-// can use the `COCOAPODS` macro definition which is
-// defined in the xcconfigs so it is available in
-// headers also when they are imported in the client
-// project.
-
-
-// AFNetworking
-#define COCOAPODS_POD_AVAILABLE_AFNetworking
-#define COCOAPODS_VERSION_MAJOR_AFNetworking 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking 0
-
-// AFNetworking/NSURLConnection
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLConnection
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLConnection 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLConnection 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLConnection 0
-
-// AFNetworking/NSURLSession
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLSession
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLSession 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLSession 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLSession 0
-
-// AFNetworking/Reachability
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_Reachability
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_Reachability 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_Reachability 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_Reachability 0
-
-// AFNetworking/Security
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_Security
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_Security 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_Security 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_Security 0
-
-// AFNetworking/Serialization
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_Serialization
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_Serialization 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_Serialization 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_Serialization 0
-
-// AFNetworking/UIKit
-#define COCOAPODS_POD_AVAILABLE_AFNetworking_UIKit
-#define COCOAPODS_VERSION_MAJOR_AFNetworking_UIKit 2
-#define COCOAPODS_VERSION_MINOR_AFNetworking_UIKit 5
-#define COCOAPODS_VERSION_PATCH_AFNetworking_UIKit 0
-
-// Debug build configuration
-#ifdef DEBUG
-
-  // AFNetworkActivityLogger
-  #define COCOAPODS_POD_AVAILABLE_AFNetworkActivityLogger
-  #define COCOAPODS_VERSION_MAJOR_AFNetworkActivityLogger 2
-  #define COCOAPODS_VERSION_MINOR_AFNetworkActivityLogger 0
-  #define COCOAPODS_VERSION_PATCH_AFNetworkActivityLogger 3
-
-#endif
@@ -1,6 +0,0 @@
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_LDFLAGS = -ObjC -l"Pods-AFNetworkActivityLogger" -l"Pods-AFNetworking" -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
-OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
-PODS_ROOT = ${SRCROOT}/Pods
@@ -1,6 +0,0 @@
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworkActivityLogger" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
-OTHER_LDFLAGS = -ObjC -l"Pods-AFNetworking" -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
-OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
-PODS_ROOT = ${SRCROOT}/Pods
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.sap.sailing.mobile.ios</groupId>
+  <artifactId>SAPTracker</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>xcode-app</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.sap.prd.mobile.ios.mios</groupId>
+        <artifactId>xcode-maven-plugin</artifactId>
+        <version>1.14.1</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
@@ -1,5 +1,5 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.1'
 link_with ['SAPTracker', 'SAPTrackerTests']
-pod 'AFNetworking', '~> 2.4'
-pod 'AFNetworkActivityLogger', :configurations => ['Debug']
+pod 'AFNetworking', '2.5.0'
+pod 'AFNetworkActivityLogger', '2.0.3', :configurations => ['Debug']
@@ -25,11 +25,11 @@ PODS:
    - AFNetworking/NSURLSession

 DEPENDENCIES:
-  - AFNetworkActivityLogger
-  - AFNetworking (~> 2.4)
+  - AFNetworkActivityLogger (= 2.0.3)
+  - AFNetworking (= 2.5.0)

 SPEC CHECKSUMS:
-  AFNetworkActivityLogger: d6a2d2755fada3a1fbf1f490ec0dd92224e092a4
-  AFNetworking: 0f54cb5d16ce38c1b76948faffb8d5fb705021c7
+  AFNetworkActivityLogger: e82c9ba285b37042d86729bff5b14036c4312cd7
+  AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e

-COCOAPODS: 0.35.0
+COCOAPODS: 0.38.2
@@ -0,0 +1 @@
+../../../AFNetworkActivityLogger/AFNetworkActivityLogger/AFNetworkActivityLogger.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFSecurityPolicy.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLConnectionOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLRequestSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLResponseSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
				`@@ -1 +0,0 @@`
				`../../../AFNetworkActivityLogger/AFNetworkActivityLogger/AFNetworkActivityLogger.h`
				`@@ -1 +0,0 @@`
				`../../../AFNetworking/AFNetworking/AFHTTPRequestOperation.h`
				`@@ -1 +0,0 @@`
				`../../../AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h`
				`@@ -1 +0,0 @@`
				`../../../AFNetworking/AFNetworking/AFNetworkReachabilityManager.h`
				`@@ -1 +0,0 @@`
				`../../../AFNetworking/AFNetworking/AFSecurityPolicy.h`
				`@@ -1 +0,0 @@`
				`../../../AFNetworking/AFNetworking/AFURLConnectionOperation.h`
				`@@ -1 +0,0 @@`
				`PODS_AFNETWORKING_OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"`
				`@@ -0,0 +1 @@`
				`../../../AFNetworkActivityLogger/AFNetworkActivityLogger/AFNetworkActivityLogger.h`