Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Commit

Permalink
fix(deps, android)!: switch to local maven repo for aar dependency (#370
Browse files Browse the repository at this point in the history
)

* fix(deps, android)!: switch to local maven repo for aar dependency

Fixes #151
Fixes notifee/documentation#8

BREAKING CHANGE: add "maven { url "$rootDir/../node_modules/@notifee/react-native/android/libs" }" to "repositories" in "android/build.gradle"

* docs(example): add new local maven repo for notifee to example config

Co-authored-by: Helena Ford <helenaellieford@gmail.com>
  • Loading branch information
mikehardy and helenaford authored Sep 12, 2021
1 parent e6a348a commit d0af097
Show file tree
Hide file tree
Showing 44 changed files with 134 additions and 33 deletions.
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:4.1.3")
classpath("com.android.tools.build:gradle:7.0.1")
}
}
}

plugins {
id "io.invertase.gradle.build" version "1.4"
id "io.invertase.gradle.build" version "1.5"
}

project.evaluationDependsOn(':app')
Expand Down Expand Up @@ -65,7 +65,7 @@ dependencies {
if (findProject(':notifee_core')) {
implementation findProject(':notifee_core')
} else {
implementation fileTree(include: ['notifee_core_release.aar'], dir: 'libs')
implementation(group: 'app.notifee', name:'core', version: '+')
}
implementation 'androidx.concurrent:concurrent-futures:1.1.0' // https://developer.android.com/jetpack/androidx/releases/concurrent
implementation 'com.google.android.gms:play-services-tasks:17.2.1' // https://developers.google.com/android/guides/releases
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f8df55963d7eb41aa8c14ee753fca10e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cedcc3ba1e70b28b10cf375f641f030e9997c01b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2984e460b579d78005288f7cda93f0452e3ff1bce80f0f57bd74658ee611f69
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71b35ab8f08371fac33df596c3cddd3afc6c2bb8311373a8732874aa2d1e9372729931581acd6a1a27b1916c9a1031a18f032c40bc8970e11bbeb71da21047f0
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>app.notifee</groupId>
<artifactId>core</artifactId>
<version>202108261754</version>
<packaging>aar</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f6e0cf891e903f91ee3093356815b7a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
692dedb13cd922156e38dc5f6bcfba86e4141932
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f7ea80d7045abd14e8a836ec3a8299a245994b8bbcff7e30d2e3ae7f523c9ec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
79244ae770a7c732e5eb33d72ca3e707398ae33d0db8e104d63690fecdb156d9cc040571f09baab30ffb19db3ac00b0283b74f581c1245069b4bf477c590732b
13 changes: 13 additions & 0 deletions android/libs/app/notifee/core/maven-metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>app.notifee</groupId>
<artifactId>core</artifactId>
<versioning>
<latest>202108261754</latest>
<release>202108261754</release>
<versions>
<version>202108261754</version>
</versions>
<lastUpdated>20210912154201</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions android/libs/app/notifee/core/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
33d79ec02cd2bebd0c1cfe9502a16dd4
1 change: 1 addition & 0 deletions android/libs/app/notifee/core/maven-metadata.xml.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0bf5d007f7fa81eaad25bba677d8f37a6bd4177e
1 change: 1 addition & 0 deletions android/libs/app/notifee/core/maven-metadata.xml.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ebd875eb669b17daf6e61f9af0d57f8793fe990f8cddb7511cd9d5a81e218499
1 change: 1 addition & 0 deletions android/libs/app/notifee/core/maven-metadata.xml.sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e4995edd86f651c4f3d2c269a41a0a7f745a997aed7740f6dc6732603575649131452888336e2dfc9d320dc4c6a9504ecf6d421cfd643466357201f0dbefff2
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e700b60832702682066a206b386b5b3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c1b084a8daafb4814058701c207ad64aab908324
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6863c19fb0727f65e29c9e4297becfd4efb5270d9b6d093c996caa71750f30ff
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2d0ac665917ad0c8af34a1f350bb86249c411a0bf460ff21e280c686305a6a63478931fbbcaf2746b8ed4cd29b68d00e3e870b7ee361527c491a9839d9b61c5
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>app.notifiee</groupId>
<artifactId>core</artifactId>
<version>202108261754</version>
<packaging>aar</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
754c06688dbf0498f0e5806257de2beb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f308df1397dc94daa80f8e1ccdcefaeaed227efe
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56615ed42d737c83c6b3941fc4f15427058fe462ce8009859f7fa722343862cb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82e9a73e4a8e908307fc5de9cddcf388eef8abaeb3e95688de29f1f094311e202674922c1d590047302d9aecb7f60e816cd47b3cbc15ae6e0ed761cc09b61689
13 changes: 13 additions & 0 deletions android/libs/app/notifiee/core/maven-metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>app.notifiee</groupId>
<artifactId>core</artifactId>
<versioning>
<latest>202108261754</latest>
<release>202108261754</release>
<versions>
<version>202108261754</version>
</versions>
<lastUpdated>20210826225623</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions android/libs/app/notifiee/core/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d824fea4bfd22ee43ea850f087ee8f56
1 change: 1 addition & 0 deletions android/libs/app/notifiee/core/maven-metadata.xml.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a65e012bc26dfc30ebc78efc95172fda9d5bd8ea
1 change: 1 addition & 0 deletions android/libs/app/notifiee/core/maven-metadata.xml.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
598b366a7f5b332aefe4d6cac360b3d62a73eb754b986fad2635b85385737300
1 change: 1 addition & 0 deletions android/libs/app/notifiee/core/maven-metadata.xml.sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cfb166c1294a1399749f41e4d26134d312965c91486ff1d1411a2fd4270c3d7d442570c64334fd900f1d8e2990f03d766fb61b62d5cc2d5d4383ee987f325918
Binary file removed android/libs/notifee_core_release.aar
Binary file not shown.
3 changes: 3 additions & 0 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ allprojects {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
maven {
url("$rootDir/../node_modules/@notifee/react-native/android/libs")
}

google()
jcenter()
Expand Down
14 changes: 7 additions & 7 deletions ios/NotifeeCore.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>NotifeeCore.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>NotifeeCore.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
//
// NotifeeCore.h
// NotifeeCore
//
// Copyright © 2020 Invertase. All rights reserved.
//
/**
* Copyright (c) 2016-present Invertase Limited & Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this library except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

#import <Foundation/Foundation.h>
//! Project version number for NotifeeCore.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
//
// NotifeeCore.h
// NotifeeCore
//
// Copyright © 2020 Invertase. All rights reserved.
//
/**
* Copyright (c) 2016-present Invertase Limited & Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this library except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

#import <Foundation/Foundation.h>
//! Project version number for NotifeeCore.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Headers/NotifeeCore.h</key>
<data>
V9sgw9JBpRq1Og6YyiFnUhrRSfg=
6UDMqO8O9EGJmJpwiBEYVKklwlk=
</data>
<key>Info.plist</key>
<data>
Expand All @@ -23,11 +23,11 @@
<dict>
<key>hash</key>
<data>
V9sgw9JBpRq1Og6YyiFnUhrRSfg=
6UDMqO8O9EGJmJpwiBEYVKklwlk=
</data>
<key>hash2</key>
<data>
Q93ZjnFG4NfOQL75YCTPv6FvNqLMLnIk0D8I9t7qfXs=
dmTgvX/Zb61uwQq7Tbwm7iDVHyqGslRhlRHLpYxnGjI=
</data>
</dict>
<key>Modules/module.modulemap</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
//
// NotifeeCore.h
// NotifeeCore
//
// Copyright © 2020 Invertase. All rights reserved.
//
/**
* Copyright (c) 2016-present Invertase Limited & Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this library except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

#import <Foundation/Foundation.h>
//! Project version number for NotifeeCore.
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@notifee/react-native",
"version": "1.11.1",
"version": "2.0.0-0",
"author": "Invertase <oss@invertase.io> (http://invertase.io)",
"description": "Notifee - a feature rich notifications library for React Native.",
"main": "dist/index.js",
Expand All @@ -9,7 +9,7 @@
"validate:all:js": "eslint . --ext .js,.jsx,.ts,.tsx",
"validate:all:ts": "tsc --project ./",
"build": "genversion --es6 --semi src/version.ts && tsc",
"build:clean": "rimraf android/libs/notifee_core_debug.aar && rimraf android/build && rimraf ios/build && rimraf dist",
"build:clean": "rimraf android/libs && rimraf android/build && rimraf ios/build && rimraf dist",
"build:watch": "tsc --watch",
"prepare": "yarn run build",
"prepublishOnly": "cd ../.. && yarn run build:core",
Expand Down

0 comments on commit d0af097

Please sign in to comment.