FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Gatanasov/version update by atanasovg · Pull Request #41 · NativeScript/android · GitHub

/ android Public

Gatanasov/version update #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atanasovg merged 2 commits into from
Mar 12, 2015
Conversation 1 Commits 2 Checks 0 Files changed
Merged

Gatanasov/version update #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397b982
Update build target to API level 21.
atanasovg Mar 11, 2015
c6ef22d
Move the support library from the generator project to the runtime on…
atanasovg Mar 12, 2015
File filter

Filter by extension

Filter by extension .jar  (2) .js  (1) .prefs  (1) .properties  (3) .xml  (3) All 5 file types selected
Deleted files Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 0 additions & 10 deletions binding-generator/Generator/.settings/org.eclipse.jdt.core.prefs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Expand Down
2 changes: 1 addition & 1 deletion binding-generator/Generator/AndroidManifest.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="14" />
android:targetSdkVersion="21" />

<application
android:allowBackup="true"
Expand Down
Binary file removed binding-generator/Generator/libs/android-support-v4.jar
Show comments
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion binding-generator/Generator/project.properties
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-17
target=android-21
android.library=true
2 changes: 1 addition & 1 deletion binding-generator/Tester/AndroidManifest.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="14" />
android:targetSdkVersion="21" />

<application
android:allowBackup="true"
Expand Down
2 changes: 1 addition & 1 deletion binding-generator/Tester/project.properties
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-17
target=android-21
android.library.reference.1=../Generator
25 changes: 9 additions & 16 deletions gruntfile.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@ module.exports = function(grunt) {
packageJsonFilePath: rootDir + "/package.json",
commitVersion: process.env.GIT_COMMIT || "",
metadataGenPath: args.metadataGen,
android17SrcJar: pathModule.join(process.env.ANDROID_HOME, "platforms/android-17/android.jar"),
localAndroid17Jar: pathModule.join(rootDir, "src", "libs", "android17.jar"),
androidSupportLibSource: pathModule.join(rootDir, "binding-generator", "Generator", "libs", "android-support-v4.jar"),
androidSupportLibDestination: pathModule.join(rootDir, "src", "libs", "android-support-v4.jar"),
androidSrcJar: pathModule.join(process.env.ANDROID_HOME, "platforms/android-21/android.jar"),
localAndroidJar: pathModule.join(rootDir, "src", "libs", "android.jar"),
runtimeDir: pathModule.join(rootDir, "src"),
libsDir: pathModule.join(rootDir, "src", "libs"),
runtimeBinariesDir: pathModule.join(rootDir, "src", "dist"),
Expand All @@ -69,8 +67,8 @@ module.exports = function(grunt) {
build: {
src: [outDir]
},
android17Lib: {
src: localCfg.localAndroid17Jar
androidLib: {
src: localCfg.localAndroidJar
},
metadataGenRuntimeJar: {
src: localCfg.metadataRuntimeJar
Expand Down Expand Up @@ -158,13 +156,9 @@ module.exports = function(grunt) {
}
}
},
android17Lib: {
src: localCfg.android17SrcJar,
dest: localCfg.localAndroid17Jar
},
androidSupportLib: {
src: localCfg.androidSupportLibSource,
dest: localCfg.androidSupportLibDestination
androidLib: {
src: localCfg.androidSrcJar,
dest: localCfg.localAndroidJar
}
},
replace: {
Expand Down Expand Up @@ -219,11 +213,10 @@ module.exports = function(grunt) {

grunt.registerTask("generateMetadata", [
"exec:installMetadataGenerator",
"copy:android17Lib",
"copy:androidSupportLib",
"copy:androidLib",
"copy:runtimeJarToLibs",
"exec:runMetadataGenerator",
"clean:android17Lib",
"clean:androidLib",
"clean:metadataGenRuntimeJar"
]);

Expand Down
2 changes: 1 addition & 1 deletion src/AndroidManifest.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="17"
android:targetSdkVersion="17" />
android:targetSdkVersion="21" />

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
Expand Down
Binary file added src/libs/android-support-v4.jar
Show comments
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/project.properties
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-17
target=android-21
android.library.reference.1=../binding-generator/Generator
Back | FazBrowse Home | New Git URL