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

Merge pull request #162 from yida921/develop

Browse source 
updated android SDK versions
This commit is contained in:
chrisgarrity 2018-09-27 08:22:37 -04:00 committed by GitHub
commit c90c1ce37f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="NullableNotNullManager">
<OptionsSetting value="true" id="Add" /> <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<OptionsSetting value="true" id="Remove" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<OptionsSetting value="true" id="Checkout" /> <option name="myNullables">
<OptionsSetting value="true" id="Update" /> <value>
<OptionsSetting value="true" id="Status" /> <list size="4">
<OptionsSetting value="true" id="Edit" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<ConfirmationsSetting value="0" id="Add" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<ConfirmationsSetting value="0" id="Remove" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component> </component>
<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"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
android/ScratchJr/ScratchJr.iml
View file

@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

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

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
android { android {
compileSdkVersion 23 compileSdkVersion 27
buildToolsVersion "21.1.2" buildToolsVersion "21.1.2"
defaultConfig { defaultConfig {
@ -19,8 +19,8 @@ android {
productFlavors { productFlavors {
free { free {
applicationId "org.scratchjr.androidfree" applicationId "org.scratchjr.androidfree"
minSdkVersion 17 minSdkVersion 19
targetSdkVersion 23 targetSdkVersion 27
versionCode 21 versionCode 21
versionName "1.2.0" versionName "1.2.0"
} }
@ -28,8 +28,8 @@ android {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.google.android.gms:play-services-analytics:8.3.0' compile 'com.google.android.gms:play-services-analytics:8.3.0'
} }

8
android/ScratchJr/build.gradle
View file

@ -3,9 +3,12 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven {
url "https://maven.google.com"
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.5.0' 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:1.5.0-beta2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -16,5 +19,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven {
url "https://maven.google.com"
}
} }
} }

4
android/ScratchJr/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013 #Wed Mar 07 11:49:06 EST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip