diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f603966..e0f336e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/showcheap/android-ci:T24-B25.0.1 +image: registry.gitlab.com/showcheap/android-ci:T25-B25.0.2 before_script: - export GRADLE_USER_HOME=`pwd`/.gradle @@ -23,8 +23,14 @@ unitTests: stage: test script: - ./gradlew test + artifacts: + paths: + - app/build/reports functionalTests: stage: test script: - ./gradlew check + artifacts: + paths: + - app/build/reports diff --git a/app/build.gradle b/app/build.gradle index 3b29df15..b0de4043 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.1" + buildToolsVersion "25.0.2" defaultConfig { applicationId "leszcz_team.wulkanowy" minSdkVersion 14 @@ -24,7 +24,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.1' + compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support.constraint:constraint-layout:1.0.2' testCompile 'junit:junit:4.12' compile files('libs/jsoup-1.10.2.jar') diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8e078dc1..594810ba 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/app_name" - android:textSize="40dp" + android:textSize="40sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/activity_started.xml b/app/src/main/res/layout/activity_started.xml index b9828288..ac1003b0 100644 --- a/app/src/main/res/layout/activity_started.xml +++ b/app/src/main/res/layout/activity_started.xml @@ -15,7 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/app_name" - android:textSize="40dp" + android:textSize="40sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintLeft_toLeftOf="parent" tools:layout_constraintRight_creator="1" diff --git a/app/src/main/res/values/loginData.xml b/app/src/main/res/values/loginData.xml index 41b0b776..f0cbfe76 100644 --- a/app/src/main/res/values/loginData.xml +++ b/app/src/main/res/values/loginData.xml @@ -1,12 +1,11 @@ - - https://cufs.vulcan.net.pl/Default/Account/LogOn - https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx - https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx" - https://cufsdemo.vulcan.net.pl/Default/Account/LogOn - https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx - https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx" - u43063@demouonetplus.vulcan.net.pl - demouonetplus - - \ No newline at end of file + + https://cufs.vulcan.net.pl/Default/Account/LogOn + https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx + https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx" + https://cufsdemo.vulcan.net.pl/Default/Account/LogOn + https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx + https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx" + u43063@demouonetplus.vulcan.net.pl + demouonetplus +