Skip to content

Commit

Permalink
@bbarthec/sdk34 update android expokit (expo#5013)
Browse files Browse the repository at this point in the history
* [tools] Refactor script

* [in-app-permissions] Fix removed interface

* [android] Fix settings.gradle for distributing

* [sdk34][android] Update android expokit in expokit-npm-package
  • Loading branch information
bbarthec authored Jul 19, 2019
1 parent 7df1fe6 commit e4b42a9
Show file tree
Hide file tree
Showing 1,693 changed files with 11,331 additions and 10,868 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ dependencies {
testImplementation 'com.android.support.test:rules:1.0.2-alpha1'

/* UNCOMMENT WHEN DISTRIBUTING
implementation('host.exp.exponent:expoview:33.0.0@aar') {
implementation('host.exp.exponent:expoview:34.0.0@aar') {
transitive = true
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
exclude group: 'com.squareup.okhttp3', module: 'okhttp-urlconnection'
Expand Down
4 changes: 2 additions & 2 deletions android/expoview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'com.jakewharton.butterknife'
// WHEN_VERSIONING_REMOVE_FROM_HERE
//maven repository info
group = 'host.exp.exponent'
version = '33.0.0'
version = '34.0.0'

//Upload android library to maven with javadoc and android sources
configurations {
Expand Down Expand Up @@ -138,7 +138,7 @@ dependencies {
api 'org.webkit:android-jsc:r245459' // needs to be before react-native

/* UNCOMMENT WHEN DISTRIBUTING
api 'com.facebook.react:react-native:33.0.0'
api 'com.facebook.react:react-native:34.0.0'
addUnimodulesDependencies([
modulesPaths : ['../../packages'],
configuration: 'compileOnly',
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include ':app'

// WHEN_DISTRIBUTING_REMOVE_FROM_HERE
include ':expoview'
project(':expoview').projectDir = new File(rootDir, 'expoview')
include ':tools'
include ':ReactAndroid'
project(':ReactAndroid').projectDir = new File(rootDir, 'ReactAndroid')

// WHEN_DISTRIBUTING_REMOVE_FROM_HERE
[
// ADD_NEW_SUPPORTED_ABIS_HERE
"abi34_0_0",
Expand Down
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d1f11b263e9bbf719a4f6152a36f28b6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43048420f3accd3a1d121fd586342589c5db52ea
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17c36eda4105103e43602e153df1e790
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43ac60243ede9df59b9c679b4ad709c8a315f7eb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2fe4bf9e3ae297bcd4807cdafa9af551
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18e72e41b16bed904b38758d6393d839f0b43abe
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.facebook.react</groupId>
<artifactId>react-native</artifactId>
<version>34.0.0</version>
<packaging>aar</packaging>
<name>ReactNative</name>
<description>A framework for building native apps with React</description>
<url>https://github.com/facebook/react-native</url>
<licenses>
<license>
<name>MIT License</name>
<url>https://github.com/facebook/react-native/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>facebook</id>
<name>Facebook</name>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/facebook/react-native.git</connection>
<developerConnection>scm:git:[email protected]:facebook/react-native.git</developerConnection>
<url>https://github.com/facebook/react-native.git</url>
</scm>
<dependencies>
<dependency>
<groupId>com.facebook.infer.annotation</groupId>
<artifactId>infer-annotation</artifactId>
<version>0.11.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>appcompat-v7</artifactId>
<version>28.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.facebook.fresco</groupId>
<artifactId>fresco</artifactId>
<version>1.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.facebook.fresco</groupId>
<artifactId>imagepipeline-okhttp3</artifactId>
<version>1.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.facebook.soloader</groupId>
<artifactId>soloader</artifactId>
<version>0.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-urlconnection</artifactId>
<version>3.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>1.15.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
df29a287b6e48052659bc7068370e6e6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2c9ba00426846ffa25c20c26f3b137140dbf6897
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<groupId>com.facebook.react</groupId>
<artifactId>react-native</artifactId>
<versioning>
<release>33.0.0</release>
<release>34.0.0</release>
<versions>
<version>33.0.0</version>
<version>34.0.0</version>
</versions>
<lastUpdated>20190702091351</lastUpdated>
<lastUpdated>20190719095519</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<groupId>com.facebook.react</groupId>
<artifactId>react-native</artifactId>
<versioning>
<release>33.0.0</release>
<release>34.0.0</release>
<versions>
<version>33.0.0</version>
<version>34.0.0</version>
</versions>
<lastUpdated>20190702091351</lastUpdated>
<lastUpdated>20190719095519</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
38cf27aec4f20de139b4d6e1fbbaad8a
c25b37bbb7f85992c88743cbfdb21355
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4b4b9079f9b2c4260be126fe079732195bf45d17
ac7efd939b9dffc691d4ce6bc1f64da69f5a78d1
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Tue Jul 02 11:13:51 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058831955
#Fri Jul 19 11:55:19 CEST 2019
maven-metadata-remote.xml.lastUpdated=1563530119625
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e4b42a9

Please sign in to comment.