Merge branch 'release/1.5.4'
This commit is contained in:
commit
69f2c34531
|
|
@ -6,8 +6,8 @@ android:
|
|||
- tools
|
||||
- tools
|
||||
- platform-tools
|
||||
- build-tools-26.0.2
|
||||
- android-26
|
||||
- build-tools-27.0.3
|
||||
- android-27
|
||||
- extra-android-m2repository
|
||||
- extra-android-support
|
||||
- extra-google-m2repository
|
||||
|
|
@ -16,3 +16,4 @@ script:
|
|||
- "./gradlew build connectedCheck"
|
||||
before_install:
|
||||
- chmod +x gradlew
|
||||
- yes | sdkmanager "platforms;android-27"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ ext {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.2"
|
||||
compileSdkVersion 27
|
||||
buildToolsVersion "27.0.3"
|
||||
|
||||
dexOptions {
|
||||
maxProcessCount=2
|
||||
|
|
@ -27,7 +27,7 @@ android {
|
|||
versionName gitVersionName
|
||||
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 26
|
||||
targetSdkVersion 27
|
||||
|
||||
android.applicationVariants.all { variant ->
|
||||
def appName
|
||||
|
|
@ -38,10 +38,8 @@ android {
|
|||
appName = parent.name
|
||||
}
|
||||
|
||||
variant.outputs.each { output ->
|
||||
def newApkName
|
||||
newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk"
|
||||
output.outputFile = new File(output.outputFile.parent, newApkName)
|
||||
variant.outputs.all { output ->
|
||||
outputFileName = "${appName}-${output.baseName}-${variant.versionName}.apk"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -77,13 +75,13 @@ def getBuildConfigField(String property){
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile 'com.android.support:support-v4:26.0.0'
|
||||
compile 'com.android.support:appcompat-v7:26.0.0'
|
||||
compile 'com.google.android.gms:play-services-analytics:11.0.4'
|
||||
compile 'com.android.support:support-v4:27.0.2'
|
||||
compile 'com.android.support:appcompat-v7:27.0.2'
|
||||
compile 'com.google.android.gms:play-services-analytics:11.8.0'
|
||||
compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
|
||||
compile 'commons-io:commons-io:2.5'
|
||||
compile 'commons-io:commons-io:2.6'
|
||||
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
||||
compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
|
||||
compile 'com.google.zxing:core:3.3.0'
|
||||
compile 'com.google.code.gson:gson:2.8.1'
|
||||
compile 'com.google.zxing:core:3.3.1'
|
||||
compile 'com.google.code.gson:gson:2.8.2'
|
||||
}
|
||||
|
|
@ -198,16 +198,16 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
|
|||
if (multiple == 0 && role != Constants.TEACHER_TYPE_CODE) { //single inscriptions:
|
||||
holder.checkBox.setVisibility(View.GONE);
|
||||
holder.radioButton.setVisibility(View.VISIBLE);
|
||||
holder.radioButton.setText(groupName);
|
||||
|
||||
} else { //multiple inscriptions :
|
||||
|
||||
holder.checkBox.setVisibility(View.VISIBLE);
|
||||
holder.radioButton.setVisibility(View.GONE);
|
||||
holder.checkBox.setText(groupName);
|
||||
holder.checkBox.setChecked(member != 0);
|
||||
}
|
||||
|
||||
holder.checkBox.setText(groupName);
|
||||
holder.checkBox.setChecked(member != 0);
|
||||
|
||||
holder.nStudentText.setText(context.getString(R.string.numStudent) + ": " + String.valueOf(students));
|
||||
|
||||
if (maxStudents != -1) {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,13 @@
|
|||
</style>
|
||||
</head>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>1.5.4 (2018-02-25)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[CORRECCIONES]</lh>
|
||||
<li type="disc"><strong>Grupos:</strong> Corregida visualización del nombre de los grupos de selección única</li>
|
||||
</ul>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>1.5.3 (2017-10-25)</h4>
|
||||
<ul>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,13 @@
|
|||
</style>
|
||||
</head>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>1.5.4 (2018-02-25)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[FIXES]</lh>
|
||||
<li type="disc"><strong>Groups:</strong> Fixed display of the name of single choice groups</li>
|
||||
</ul>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>1.5.3 (2017-10-25)</h4>
|
||||
<ul>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'org.ajoberstar:grgit:1.8.0'
|
||||
}
|
||||
}
|
||||
|
|
@ -12,7 +13,7 @@ buildscript {
|
|||
allprojects {
|
||||
repositories {
|
||||
jcenter()
|
||||
google()
|
||||
maven { url 'https://oss.sonatype.org/content/repositories/ksoap2-android-releases' }
|
||||
maven { url 'https://maven.google.com' }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Fri Mar 03 17:05:52 CET 2017
|
||||
#Wed Oct 25 20:37:21 CEST 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user