Skip to content

Commit 9005833

Browse files
author
XenGi
committed
Merge branch 'release/1.0.0'
2 parents 9f64705 + 14ab72f commit 9005833

58 files changed

Lines changed: 329 additions & 119 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/app.iml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2021
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2122
</configuration>
2223
</facet>
@@ -78,6 +79,7 @@
7879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8183
</content>
8284
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8385
<orderEntry type="sourceFolder" forTests="false" />

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ android {
55
buildToolsVersion "21.1.2"
66

77
defaultConfig {
8-
applicationId "org.ligi.pmlctrl"
9-
minSdkVersion 10
8+
applicationId "org.c_base.pymlgame.controller"
9+
minSdkVersion 15
1010
targetSdkVersion 21
1111
versionCode 1
12-
versionName "1.0"
12+
versionName "1.0.0"
1313
}
1414
buildTypes {
1515
release {

‎app/link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://xen.crew.c-base.org/pymlgame-controller/pymlgame-controller_latest.apk

‎app/manifest-merger-release-report.txt‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
-- Merging decision tree log ---
2+
manifest
3+
ADDED from AndroidManifest.xml:2:1
4+
package
5+
ADDED from AndroidManifest.xml:4:5
6+
INJECTED from AndroidManifest.xml:0:0
7+
INJECTED from AndroidManifest.xml:0:0
8+
android:versionName
9+
INJECTED from AndroidManifest.xml:0:0
10+
INJECTED from AndroidManifest.xml:0:0
11+
xmlns:android
12+
ADDED from AndroidManifest.xml:3:5
13+
android:versionCode
14+
INJECTED from AndroidManifest.xml:0:0
15+
INJECTED from AndroidManifest.xml:0:0
16+
android:installLocation
17+
ADDED from AndroidManifest.xml:5:5
18+
supports-screens
19+
ADDED from AndroidManifest.xml:6:5
20+
android:largeScreens
21+
ADDED from AndroidManifest.xml:6:23
22+
android:smallScreens
23+
ADDED from AndroidManifest.xml:6:106
24+
android:normalScreens
25+
ADDED from AndroidManifest.xml:6:51
26+
android:anyDensity
27+
ADDED from AndroidManifest.xml:6:80
28+
uses-permission#android.permission.INTERNET
29+
ADDED from AndroidManifest.xml:7:5
30+
android:name
31+
ADDED from AndroidManifest.xml:7:22
32+
uses-permission#android.permission.VIBRATE
33+
ADDED from AndroidManifest.xml:8:5
34+
android:name
35+
ADDED from AndroidManifest.xml:8:22
36+
application
37+
ADDED from AndroidManifest.xml:9:5
38+
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
39+
MERGED from com.android.support:support-v4:21.0.3:16:5
40+
android:label
41+
ADDED from AndroidManifest.xml:12:9
42+
android:allowBackup
43+
ADDED from AndroidManifest.xml:10:9
44+
android:icon
45+
ADDED from AndroidManifest.xml:11:9
46+
android:theme
47+
ADDED from AndroidManifest.xml:13:9
48+
activity#org.c_base.pymlgame.controller.MainActivity
49+
ADDED from AndroidManifest.xml:14:9
50+
android:screenOrientation
51+
ADDED from AndroidManifest.xml:17:13
52+
android:label
53+
ADDED from AndroidManifest.xml:16:13
54+
android:name
55+
ADDED from AndroidManifest.xml:15:13
56+
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
57+
ADDED from AndroidManifest.xml:18:13
58+
action#android.intent.action.MAIN
59+
ADDED from AndroidManifest.xml:19:17
60+
android:name
61+
ADDED from AndroidManifest.xml:19:25
62+
category#android.intent.category.LAUNCHER
63+
ADDED from AndroidManifest.xml:20:17
64+
android:name
65+
ADDED from AndroidManifest.xml:20:27
66+
uses-sdk
67+
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
68+
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
69+
MERGED from com.android.support:support-v4:21.0.3:15:5
70+
android:targetSdkVersion
71+
INJECTED from AndroidManifest.xml:0:0
72+
INJECTED from AndroidManifest.xml:0:0
73+
android:minSdkVersion
74+
INJECTED from AndroidManifest.xml:0:0
75+
INJECTED from AndroidManifest.xml:0:0

app/src/androidTest/java/org/ligi/pmlctrl/ApplicationTest.java renamed to app/src/androidTest/java/org/c_base/pymlgame/controller/ApplicationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.ligi.pmlctrl;
1+
package org.c_base.pymlgame.controller;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;
@@ -10,4 +10,4 @@ public class ApplicationTest extends ApplicationTestCase<Application> {
1010
public ApplicationTest() {
1111
super(Application.class);
1212
}
13-
}
13+
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.ligi.pmlctrl" >
4-
5-
<uses-permission android:name="android.permission.INTERNET"/>
2+
<manifest
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
package="org.c_base.pymlgame.controller"
5+
android:installLocation="auto">
6+
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true" />
7+
<uses-permission android:name="android.permission.INTERNET" />
8+
<uses-permission android:name="android.permission.VIBRATE" />
69
<application
710
android:allowBackup="true"
811
android:icon="@drawable/ic_launcher"
912
android:label="@string/app_name"
10-
android:theme="@style/AppTheme" >
13+
android:theme="@style/AppTheme">
1114
<activity
1215
android:name=".MainActivity"
1316
android:label="@string/app_name"
1417
android:screenOrientation="landscape">
1518
<intent-filter>
1619
<action android:name="android.intent.action.MAIN" />
17-
1820
<category android:name="android.intent.category.LAUNCHER" />
1921
</intent-filter>
2022
</activity>
2123
</application>
22-
2324
</manifest>

0 commit comments

Comments
 (0)