Skip to content

Commit

Permalink
Artemis Messenger 5.0.0/5.0.1, massive IAN overhaul, modularization
Browse files Browse the repository at this point in the history
  • Loading branch information
JordanLongstaff committed Apr 6, 2018
1 parent 2094db3 commit 4e6ce21
Show file tree
Hide file tree
Showing 363 changed files with 9,086 additions and 8,323 deletions.
54 changes: 54 additions & 0 deletions .cproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="com.android.toolchain.gcc.1765508760">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.1765508760" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.1765508760" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.android.toolchain.gcc.1765508760.1451936699" name="/" resourcePath="">
<toolChain id="com.android.toolchain.gcc.536061183" name="Android GCC" superClass="com.android.toolchain.gcc">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.43413408" isAbstract="false" superClass="com.android.targetPlatform"/>
<builder id="com.android.builder.446100679" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
</outputEntries>
</builder>
<tool id="com.android.gcc.compiler.1510421854" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
<inputType id="com.android.gcc.inputType.807884771" superClass="com.android.gcc.inputType"/>
</tool>
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Artemis Messenger.null.1046508228" name="Artemis Messenger"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1765508760;com.android.toolchain.gcc.1765508760.1451936699;com.android.gcc.compiler.1510421854;com.android.gcc.inputType.807884771">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope"/>
</cproject>
22 changes: 22 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
Expand All @@ -25,9 +31,25 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
24 changes: 15 additions & 9 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="artemis.messenger"
android:installLocation="preferExternal"
android:revisionCode="35"
android:versionCode="36"
android:versionName="4.4.3" >
android:revisionCode="37"
android:versionCode="38"
android:versionName="5.0.1" >

<uses-sdk
android:minSdkVersion="8"
android:minSdkVersion="9"
android:targetSdkVersion="22" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

Expand All @@ -32,13 +35,12 @@

<service
android:name=".CommsService"
android:stopWithTask="false"
android:exported="false" />

android:exported="false"
android:stopWithTask="false" />
<service
android:name=".NotificationCleanupService"
android:stopWithTask="false"
android:exported="false" />
android:exported="false"
android:stopWithTask="false" />

<activity
android:name=".SettingsActivity"
Expand All @@ -56,6 +58,10 @@
android:name=".HelpPageActivity"
android:label="@string/title_activity_help_page" >
</activity>
<activity
android:name=".ConnectActivity"
android:label="@string/title_activity_connect" >
</activity>
</application>

</manifest>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Artemis Messenger 4.4.3
# Artemis Messenger 4.4.4

## What is Artemis Messenger?

Expand Down
Binary file removed assets/dat/PirateBrigantine.snt
Binary file not shown.
Binary file removed assets/dat/PirateLongbow.snt
Binary file not shown.
Binary file removed assets/dat/PirateStrongbow.snt
Binary file not shown.
Binary file removed assets/dat/TSNMediumCarrier.snt
Binary file not shown.
Binary file removed assets/dat/TSNMineLayer.snt
Binary file not shown.
Binary file removed assets/dat/TSNSuperDread.snt
Binary file not shown.
Binary file removed assets/dat/artemis-3.snt
Binary file not shown.
Binary file removed assets/dat/artemis-4.snt
Binary file not shown.
Binary file removed assets/dat/artemis-5.snt
Binary file not shown.
Binary file removed assets/dat/artemis-scout.snt
Binary file not shown.
Binary file removed assets/dat/artemis.snt
Binary file not shown.
Loading

0 comments on commit 4e6ce21

Please sign in to comment.