scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 10:05:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #187 from chrisgarrity/rebuild-versions

Browse source 
Rebuild versions
This commit is contained in:
chrisgarrity 2018-10-02 08:17:45 -04:00 committed by GitHub
commit c0bdc36268
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/ScratchJr/.idea/misc.xml
View file

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@ -24,7 +27,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

8
android/ScratchJr/app/build.gradle
View file

@ -1,9 +1,8 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
android {
compileSdkVersion 27
buildToolsVersion "21.1.2"
buildToolsVersion "24.0.2"
defaultConfig {
applicationId "org.scratchjr.android"
@ -30,7 +29,8 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.google.android.gms:play-services-analytics:8.3.0'
compile 'com.android.support:support-v4:27.1.0'
compile 'com.google.android.gms:play-services-analytics:15.0.0'
}
def appModuleRootFolder = '.'
@ -103,3 +103,5 @@ afterEvaluate {
}
clean.dependsOn('cleanScratchJrResources')
apply plugin: 'com.google.gms.google-services'

6
android/ScratchJr/app/src/main/AndroidManifest.xml
View file

@ -12,11 +12,7 @@
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.microphone" android:required="false" />
<supports-screens android:smallScreens="false"
android:normalScreens="false"
android:largeScreens="true"
android:xlargeScreens="true"
android:requiresSmallestWidthDp="500" />
<supports-screens android:requiresSmallestWidthDp="500" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"

2
android/ScratchJr/build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.google.gms:google-services:1.5.0-beta2'
classpath 'com.google.gms:google-services:3.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
bin/bundle-compile.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh
cd ..;
/usr/local/bin/node ./node_modules/webpack/bin/webpack.js
/usr/local/bin/node ./node_modules/webpack/bin/webpack.js --mode=production

2
editions/free/android-resources/google-services.json
View file

@ -1 +1 @@
{"project_info":{"project_id":"scratchjr-1118","project_number":"162006577143","name":"ScratchJr"},"client":[{"client_info":{"mobilesdk_app_id":"1:162006577143:android:30ace9185722a94d","client_id":"android:org.scratchjr.androidfree","client_type":1,"android_client_info":{"package_name":"org.scratchjr.androidfree"}},"oauth_client":[],"api_key":[],"services":{"analytics_service":{"status":2,"analytics_property":{"tracking_id":"UA-68375411-1"}},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":1},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}
{"project_info":{"project_id":"scratchjr-1118","project_number":"162006577143","name":"ScratchJr"},"client":[{"client_info":{"mobilesdk_app_id":"1:162006577143:android:30ace9185722a94d","client_id":"android:org.scratchjr.androidfree","client_type":1,"android_client_info":{"package_name":"org.scratchjr.androidfree"}},"oauth_client":[],"api_key":[{"current_key":""}],"services":{"analytics_service":{"status":2,"analytics_property":{"tracking_id":"UA-68375411-1"}},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":1},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}