Skip to content

Commit 147fe4b

Browse files
author
blagoev
committed
Merge branch 'master' into release
Conflicts: CONTRIBUTING.md
2 parents f553eeb + 6339af2 commit 147fe4b

File tree

660 files changed

+99535
-3921
lines changed

Some content is hidden

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

660 files changed

+99535
-3921
lines changed

‎.gitattributes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ dist/
55
local.properties
66

77
gen/
8+
armeabi-v7a/
9+
x86/
10+
obj/
11+
bin/

‎CONTRIBUTING.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ Before you submit a Pull Request, consider the following guidelines.
6161
Search GitHub for an open or closed Pull Request that relates to your submission.
6262
Clone the repository.
6363
```bash
64-
git clone git@github.com:NativeScript/cross-platform-modules.git
65-
```
66-
Initialize the submodules.
67-
```bash
68-
git submodule update --init --recursive
64+
git clone git@github.com:NativeScript/android-runtime.git
6965
```
7066
Make your changes in a new git branch. We use the Gitflow branching model so you will have to branch from our master branch.
7167
```bash
@@ -84,7 +80,7 @@ Push your branch to GitHub.
8480
```bash
8581
git push origin my-fix-branch
8682
```
87-
In GitHub, send a Pull Request to NativeScript:cross-platform-modules:master.
83+
In GitHub, send a Pull Request to NativeScript:android-runtime:master.
8884
If we suggest changes, you can modify your branch, rebase, and force a new push to your GitHub repository to update the Pull Request.
8985
```bash
9086
git rebase master -i
@@ -137,14 +133,7 @@ Without at least the first 2 items in this list, we won't have any clue why you'
137133

138134
## Code Style
139135

140-
All code contributed to this project should adhere to a consistent style, so please keep these in mind before you submit your Pull Requests:
141-
142-
- Tab indentation, size of 4
143-
- Semicolons are nice. Use them
144-
- Double quotes
145-
- No trailing whitespace
146-
- Declare one variable per var statement
147-
- Declare variables at the top of a scope
148-
- Return early
136+
We are currently using Eclipse to write code. We are using predefined code formating rules for C++ and Java:
149137

150-
For a more detailed guide, check the [Coding Convention](CodingConvention.md).
138+
* [C++](./CodingStyle.Cpp.xml)
139+
* [Java](./CodingStyle.Java.xml)

‎README.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
1-
# android-runtime
2-
Contains the source code for the android runtime.
1+
# Android-Runtime
2+
Contains the source code for the NativeScript's Android runtime.
3+
4+
# Main Projects
5+
The repo is structured in the following projects (ordered by dependencies):
6+
7+
* **android-binding-generator** - enables Java & Android types to be dynamically created at runtime. Needed by the `extend` routine.
8+
* **android-runtime** - contains the core logic behind the NativeScript's Android Runtime. This project contains native C++ code and needs the Android NDK to build properly.
9+
* **android-runtime-testapp** - this is a vanilla Android Application, which contains the tests for the runtime project.
10+
11+
# Helper Projects
12+
13+
* **android-binding-generator-tester** - contains the tests for the binding-generator project.
14+
* **build/project-template** - this is an empty placeholder Android Application project, used by the [NativeScript CLI](https://github.com/NativeScript/nativescript-cli) when building an Android project.
15+
16+
# Build Prerequisites
17+
The source in this repo is organized in Eclipse projects, using the ADT plugin. Following are the needed software if you need to build the project locally.
18+
19+
* Install the latest [Android SDK](http://developer.android.com/sdk/index.html#Other).
20+
* Install the [ADT Plugin](http://developer.android.com/tools/sdk/eclipse-adt.html) and the supported Eclipse version as described on the plugin page.
21+
* Download Android API Level 21 through the [SDK Manager](http://developer.android.com/tools/help/sdk-manager.html).
22+
* Download and install the [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html).

‎binding-generator/.gitattributes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎binding-generator/.gitignore

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Specify filepatterns you want git to ignore.
2+
3+
Example:
4+
#ignore thumbnails created by windows
5+
Thumbs.db
6+
#Ignore files build by Visual Studio
7+
*.user
8+
*.aps
9+
*.pch
10+
*.vspscc
11+
*_i.c
12+
*_p.c
13+
*.ncb
14+
*.suo
15+
*.bak
16+
*.cache
17+
*.ilk
18+
*.log
19+
[Bb]in
20+
[Dd]ebug*/
21+
*.sbr
22+
obj/
23+
[Rr]elease*/
24+
_ReSharper*/
25+
local.properties
26+
R.java.d

‎binding-generator/Generator/.classpath

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
6+
<classpathentry kind="src" path="src"/>
7+
<classpathentry kind="src" path="gen"/>
8+
<classpathentry kind="output" path="bin/classes"/>
9+
</classpath>

‎binding-generator/Generator/.project

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>android-binding-generator</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

0 commit comments

Comments
 (0)