Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit 1684c62

Browse files
weblateweblate
committed
Merge remote-tracking branch 'origin/master'
2 parents 390669d + 7eeb836 commit 1684c62

File tree

4 files changed

+37
-33
lines changed

4 files changed

+37
-33
lines changed

‎Transistor.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,24 +86,30 @@
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.0.0/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.0.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.0.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.0.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.0.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.0.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.0.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.0.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.0.0/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.0.0/jars" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.0.0/jars" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.0.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.0.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.0.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.0.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.0.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.0.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.0.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.0.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.0.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.0.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.0.1/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.0.1/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.0.1/jars" />
101101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
102104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
103108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
104109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
106111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
107113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
108114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
109115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -113,18 +119,18 @@
113119
</content>
114120
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
115121
<orderEntry type="sourceFolder" forTests="false" />
116-
<orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
117-
<orderEntry type="library" exported="" name="design-25.0.0" level="project" />
118-
<orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
119-
<orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
120-
<orderEntry type="library" exported="" name="transition-25.0.0" level="project" />
121-
<orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
122-
<orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
123-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
124-
<orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
125-
<orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
126-
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
127-
<orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
128-
<orderEntry type="library" exported="" name="recyclerview-v7-25.0.0" level="project" />
122+
<orderEntry type="library" exported="" name="support-annotations-25.0.1" level="project" />
123+
<orderEntry type="library" exported="" name="design-25.0.1" level="project" />
124+
<orderEntry type="library" exported="" name="transition-25.0.1" level="project" />
125+
<orderEntry type="library" exported="" name="support-compat-25.0.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-fragment-25.0.1" level="project" />
127+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.1" level="project" />
128+
<orderEntry type="library" exported="" name="support-v4-25.0.1" level="project" />
129+
<orderEntry type="library" exported="" name="support-core-ui-25.0.1" level="project" />
130+
<orderEntry type="library" exported="" name="support-media-compat-25.0.1" level="project" />
131+
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.1" level="project" />
132+
<orderEntry type="library" exported="" name="appcompat-v7-25.0.1" level="project" />
133+
<orderEntry type="library" exported="" name="recyclerview-v7-25.0.1" level="project" />
134+
<orderEntry type="library" exported="" name="support-core-utils-25.0.1" level="project" />
129135
</component>
130136
</module>

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.y20k.transistor"
99
minSdkVersion 19
1010
targetSdkVersion 25
11-
versionCode 32
12-
versionName "2.1.6 (Moonage Daydream)"
11+
versionCode 33
12+
versionName "2.1.7 (Moonage Daydream)"
1313
vectorDrawables.useSupportLibrary = true
1414
}
1515
buildTypes {
@@ -22,6 +22,6 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:25.0.0'
26-
compile 'com.android.support:design:25.0.0'
25+
compile 'com.android.support:appcompat-v7:25.0.1'
26+
compile 'com.android.support:design:25.0.1'
2727
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<data android:mimeType="audio/x-scpls" />
5252
<data android:mimeType="application/x-mpegurl" />
5353
<data android:mimeType="audio/mpegurl" />
54-
<data android:scheme="y20k" android:host="transistor" />
5554
</intent-filter>
5655

5756
<!-- File extensions -->
@@ -66,7 +65,6 @@
6665
<data android:pathPattern=".*\\.m3u" />
6766
<data android:pathPattern=".*\\.m3u8" />
6867
<data android:pathPattern=".*\\.pls" />
69-
<data android:scheme="y20k" android:host="transistor" />
7068
</intent-filter>
7169

7270
</activity>

0 commit comments

Comments
 (0)