github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 00:49:10 -05:00
Code

Merge branch 'fix-build' into 'master'

Browse Source 
Fix build

See merge request !3
This commit is contained in:
mklkj 2017-04-07 19:15:43 +00:00
commit fdc7fb36a3
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -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

4
app/build.gradle
View File

@ -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')

2
app/src/main/res/layout/activity_main.xml
View File

@ -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"

2
app/src/main/res/layout/activity_started.xml
View File

@ -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"

21
app/src/main/res/values/loginData.xml
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="urlStepOneRelease">https://cufs.vulcan.net.pl/Default/Account/LogOn</string>
<string name="urlStepTwoRelease">https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
<string name="urlStepThreeRelease">https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
<string name="urlStepOneDebug">https://cufsdemo.vulcan.net.pl/Default/Account/LogOn</string>
<string name="urlStepTwoDebug">https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
<string name="urlStepThreeDebug">https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
<string name="emailDebug">u43063@demouonetplus.vulcan.net.pl</string>
<string name="countyDebug">demouonetplus</string>
</resources>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="urlStepOneRelease">https://cufs.vulcan.net.pl/Default/Account/LogOn</string>
<string name="urlStepTwoRelease">https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
<string name="urlStepThreeRelease">https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
<string name="urlStepOneDebug">https://cufsdemo.vulcan.net.pl/Default/Account/LogOn</string>
<string name="urlStepTwoDebug">https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
<string name="urlStepThreeDebug">https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
<string name="emailDebug">u43063@demouonetplus.vulcan.net.pl</string>
<string name="countyDebug">demouonetplus</string>
</resources>