Skip to content

Commit

Permalink
Update Target SDK Version to 29 (#886)
Browse files Browse the repository at this point in the history
Also update gradle wrapper and travis file and fixes a build error.
  • Loading branch information
dmfs authored Nov 15, 2019
1 parent 423e3b0 commit 8431d4a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ android:
- platform-tools
- tools
- build-tools-28.0.3
- build-tools-29.0.2
- android-24
- android-28
- android-29
- extra
- extra-android-m2repository
- sys-img-armeabi-v7a-android-24
Expand All @@ -33,4 +35,4 @@ script:
- ./gradlew check connectedAndroidTest

after_script:
- cat /home/travis/build/dmfs/opentasks/opentasks/build/reports/lint-results.xml
- cat /home/travis/build/dmfs/opentasks/opentasks/build/reports/lint-results.xml
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.2'
classpath("com.github.triplet.gradle:play-publisher:2.0.0-rc1")
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPILE_SDK_VERSION=28
COMPILE_SDK_VERSION=29
MIN_SDK_VERSION=19
TARGET_SDK_VERSION=26
TARGET_SDK_VERSION=29
VERSION_OVERRIDE=0
android.enableJetifier=true
android.useAndroidX=true
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Nov 14 17:12:16 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
2 changes: 1 addition & 1 deletion opentasks/src/main/res/values-cy/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@

<!-- GET_ACCOUNTS permission (in CONTACTS permission group) requesting dialog: -->
<string name="opentasks_permission_request_dialog_getaccounts_title">Angen caniatâd</string>
<string name="opentasks_permission_request_dialog_getaccounts_message"><![CDATA[Er mwyn darllen y rhestr o gyfrifon ar dy ddyfais sy'n cefnogi cydamseru tasgau, mae ar %s angen caniatâd GET_ACCOUNTS.<br/><br/>
<string name="opentasks_permission_request_dialog_getaccounts_message"><![CDATA[Er mwyn darllen y rhestr o gyfrifon ar dy ddyfais sy\'n cefnogi cydamseru tasgau, mae ar %s angen caniatâd GET_ACCOUNTS.<br/><br/>
Noder, oherwydd dewis anffodus gan Google, caiff y cais am ganiatâd ei labelu fel &quot;access your contacts&quot; yn hytrach na &quot;read your accounts&quot;. Gweler <a href="https://issuetracker.google.com/issues/37065963">Issue 37065963</a> am wybodaeth bellach.]]></string>
<string name="opentasks_permission_request_dialog_getaccounts_button_continue">Parhau</string>
<string name="opentasks_permission_request_dialog_getaccounts_button_settings">Agor Gosodiadau</string>
Expand Down

0 comments on commit 8431d4a

Please sign in to comment.